summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/awi.c5
-rw-r--r--sys/dev/ic/pcdisplayvar.h6
-rw-r--r--sys/dev/ic/vga.c6
3 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index 91959f0e9ac..349f58ce1ca 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: awi.c,v 1.22 2006/06/23 06:27:11 miod Exp $ */
+/* $OpenBSD: awi.c,v 1.23 2007/02/11 20:29:22 miod Exp $ */
/* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */
/*-
@@ -85,9 +85,6 @@
* and to support adhoc mode by Atsushi Onoe <onoe@netbsd.org>
*/
-#ifndef __OpenBSD__
-#include "opt_inet.h"
-#endif
#if defined(__FreeBSD__) && __FreeBSD__ >= 4
#define NBPFILTER 1
#elif defined(__FreeBSD__) && __FreeBSD__ >= 3
diff --git a/sys/dev/ic/pcdisplayvar.h b/sys/dev/ic/pcdisplayvar.h
index 4d5044ca7d9..8c07f33d13a 100644
--- a/sys/dev/ic/pcdisplayvar.h
+++ b/sys/dev/ic/pcdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcdisplayvar.h,v 1.8 2006/11/29 19:11:15 miod Exp $ */
+/* $OpenBSD: pcdisplayvar.h,v 1.9 2007/02/11 20:29:22 miod Exp $ */
/* $NetBSD: pcdisplayvar.h,v 1.8 2000/01/25 02:44:03 ad Exp $ */
/*
@@ -27,10 +27,6 @@
*
*/
-#if 0
-#include "opt_pcdisplay.h"
-#endif
-
struct pcdisplayscreen {
struct pcdisplay_handle *hdl;
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 4854a63ce30..001c8b87ed7 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.44 2007/02/06 22:03:23 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.45 2007/02/11 20:29:22 miod Exp $ */
/* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
/*
@@ -49,10 +49,6 @@
#include <dev/ic/pcdisplay.h>
-#if 0
-#include "opt_wsdisplay_compat.h" /* for WSCONS_SUPPORT_PCVTFONTS */
-#endif
-
static struct vgafont {
char name[WSFONT_NAME_SIZE];
int height;