Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/bktr bt848_format is only defined in a __FreeBSD...



details:   https://anonhg.NetBSD.org/src/rev/ff6047c9c42a
branches:  trunk
changeset: 783308:ff6047c9c42a
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Dec 14 19:38:36 2012 +0000

description:
bt848_format is only defined in a __FreeBSD__ section of bktr_os.c and
overriding the local (static) definition with extern is bogus.

diffstat:

 sys/dev/pci/bktr/bktr_core.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r f96d4253aa35 -r ff6047c9c42a sys/dev/pci/bktr/bktr_core.c
--- a/sys/dev/pci/bktr/bktr_core.c      Fri Dec 14 18:42:25 2012 +0000
+++ b/sys/dev/pci/bktr/bktr_core.c      Fri Dec 14 19:38:36 2012 +0000
@@ -1,6 +1,6 @@
 /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
 
-/*     $NetBSD: bktr_core.c,v 1.53 2012/10/27 17:18:36 chs Exp $       */
+/*     $NetBSD: bktr_core.c,v 1.54 2012/12/14 19:38:36 joerg Exp $     */
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
 
 /*
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.53 2012/10/27 17:18:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.54 2012/12/14 19:38:36 joerg Exp $");
 
 #include "opt_bktr.h"          /* Include any kernel config options */
 
@@ -969,7 +969,6 @@
 /*
  *
  */
-extern int bt848_format; /* used to set the default format, PAL or NTSC */
 int
 video_open(bktr_ptr_t bktr)
 {



Home | Main Index | Thread Index | Old Index