Module Name: src
Committed By: joerg
Date: Fri Dec 14 19:38:36 UTC 2012
Modified Files:
src/sys/dev/pci/bktr: bktr_core.c
Log Message:
bt848_format is only defined in a __FreeBSD__ section of bktr_os.c and
overriding the local (static) definition with extern is bogus.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/bktr/bktr_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_core.c
diff -u src/sys/dev/pci/bktr/bktr_core.c:1.53 src/sys/dev/pci/bktr/bktr_core.c:1.54
--- src/sys/dev/pci/bktr/bktr_core.c:1.53 Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pci/bktr/bktr_core.c Fri Dec 14 19:38:36 2012
@@ -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 @@ bktr_softintr(void *cookie)
/*
*
*/
-extern int bt848_format; /* used to set the default format, PAL or NTSC */
int
video_open(bktr_ptr_t bktr)
{
