Remove _KERNEL_OPT leftovers.

16 files changed, 16 insertions, 103 deletions

diff --git a/sys/arch/amd64/include/psl.h b/sys/arch/amd64/include/psl.h
index 67529f8bc6e..081c7152e53 100644
--- a/sys/arch/amd64/include/psl.h
+++ b/sys/arch/amd64/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.2 2005/12/13 00:18:19 jsg Exp $	*/
+/*	$OpenBSD: psl.h,v 1.3 2007/02/11 20:29:20 miod Exp $	*/
 /*	$NetBSD: psl.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $	*/
 
 /*-
@@ -63,9 +63,6 @@
 #define	PSL_MBZ		0xffc08028	/* must be zero bits */
 
 #define	PSL_USERSET	(PSL_MBO | PSL_I)
-#if defined(_KERNEL_OPT)
-#include "opt_vm86.h"
-#endif
 #ifdef VM86
 #define	PSL_USERSTATIC	(PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP)
 #else
diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c
index a005a9b7e1b..863a0c42918 100644
--- a/sys/arch/sparc64/sparc64/openfirm.c
+++ b/sys/arch/sparc64/sparc64/openfirm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.c,v 1.12 2007/01/16 14:39:57 tsi Exp $	*/
+/*	$OpenBSD: openfirm.c,v 1.13 2007/02/11 20:29:22 miod Exp $	*/
 /*	$NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $	*/
 
 /*
@@ -752,10 +752,6 @@ OF_milliseconds()
 	return (args.ticks);
 }
 
-#if defined(_KERNEL_OPT)
-#include "opt_ddb.h"
-#endif
-
 #ifdef DDB
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
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;
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index f2e6654a481..a3fc830814b 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_card.c,v 1.13 2007/01/08 08:29:37 pedro Exp $	*/
+/*	$OpenBSD: bktr_card.c,v 1.14 2007/02/11 20:29:22 miod Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -48,10 +48,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OpenBSD__
-#include "opt_bktr.h"		/* Include any kernel config options */
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index ac9eb62ce7e..c6eaa5bf9dc 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_core.c,v 1.20 2006/12/29 13:04:37 pedro Exp $	*/
+/*	$OpenBSD: bktr_core.c,v 1.21 2007/02/11 20:29:22 miod Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -95,10 +95,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OpenBSD__
-#include "opt_bktr.h"		/* Include any kernel config options */
-#endif
-
 #ifdef __FreeBSD__
 #include "bktr.h"
 #endif /* __FreeBSD__ */
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index af54a42bb3d..bcc96e16f9b 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_os.c,v 1.24 2006/02/05 23:52:58 jakemsr Exp $	*/
+/*	$OpenBSD: bktr_os.c,v 1.25 2007/02/11 20:29:22 miod Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
 
 /*
@@ -53,10 +53,6 @@
 #include "bktr.h"
 #endif /* __FreeBSD__ */
 
-#ifndef __OpenBSD__
-#include "opt_bktr.h"		/* include any kernel config options */
-#endif
-
 #define FIFO_RISC_DISABLED      0
 #define ALL_INTS_DISABLED       0
 
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 5fd8c977e73..caa9d8d92c9 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.49 2006/09/26 12:23:40 jsg Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.50 2007/02/11 20:29:22 miod Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,12 +77,6 @@
  * proper cleanup on errors
  */
 
-#if defined(__NetBSD__)
-#include "opt_inet.h"
-#include "opt_ns.h"
-#include "rnd.h"
-#endif
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 96657878929..31d10e658af 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.31 2006/06/23 06:27:11 miod Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.32 2007/02/11 20:29:22 miod Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -56,14 +56,7 @@
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 
-#if defined(__NetBSD__)
-#include "opt_inet.h"
-#include "opt_ns.h"
-#include "bpfilter.h"
-#include "rnd.h"
-#elif defined(__OpenBSD__)
 #include "bpfilter.h"
-#endif /* defined(__OpenBSD__) */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index a2a0937d570..c7259f69dc9 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.43 2007/01/09 16:30:08 deraadt Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.44 2007/02/11 20:29:22 miod Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -70,14 +70,7 @@
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 
-#if defined(__NetBSD__)
-#include "opt_inet.h"
-#include "opt_ns.h"
-#include "bpfilter.h"
-#include "rnd.h"
-#elif defined(__OpenBSD__)
 #include "bpfilter.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 5ff49b21d88..81fb5fdd1b6 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.25 2006/06/23 06:27:11 miod Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.26 2007/02/11 20:29:22 miod Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,12 +41,6 @@
  * Prolific PL2301/PL2302 driver
  */
 
-#if defined(__NetBSD__)
-#include "opt_inet.h"
-#include "opt_ns.h"
-#include "rnd.h"
-#endif
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 9f7f5d5de26..301beb72621 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.33 2006/07/14 23:07:26 brad Exp $ */
+/*	$OpenBSD: if_url.c,v 1.34 2007/02/11 20:29:22 miod Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -43,12 +43,6 @@
  *	powerhook() support?
  */
 
-#if defined(__NetBSD__)
-#include "opt_inet.h"
-#include "opt_ns.h"
-#include "rnd.h"
-#endif
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 7c324cb1fd0..eab33ccd34a 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.26 2007/01/13 07:43:15 miod Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.27 2007/02/11 20:29:22 miod Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -75,11 +75,6 @@
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 
-#if defined(__NetBSD__)
-#include "opt_wsdisplay_compat.h"
-#include "opt_ddb.h"
-#endif
-
 #ifdef UKBD_DEBUG
 #define DPRINTF(x)	do { if (ukbddebug) logprintf x; } while (0)
 #define DPRINTFN(n,x)	do { if (ukbddebug>(n)) logprintf x; } while (0)
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 6aca1098093..e73d1d5a028 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.44 2006/12/06 10:37:29 bernd Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.45 2007/02/11 20:29:22 miod Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -34,23 +34,7 @@
 
 #include <sys/param.h>
 
-#if defined (__FreeBSD__)
-#include "opt_inet.h"
-#include "opt_ipx.h"
-#endif
-
-#ifdef NetBSD1_3
-#  if NetBSD1_3 > 6
-#      include "opt_inet.h"
-#      include "opt_iso.h"
-#  endif
-#endif
-
-#ifdef __OpenBSD__
 #define HIDE
-#else
-#define HIDE static
-#endif
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index 1afac27cc25..42d2b80e605 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs.h,v 1.3 2003/05/20 03:36:42 tedu Exp $	*/
+/*	$OpenBSD: ntfs.h,v 1.4 2007/02/11 20:29:22 miod Exp $	*/
 /*	$NetBSD: ntfs.h,v 1.5 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -30,10 +30,6 @@
  */
 
 /*#define NTFS_DEBUG 1*/
-#if defined(__NetBSD__) && defined(_KERNEL_OPT)
-#include "opt_ntfs.h"
-#endif
-
 typedef u_int64_t cn_t;
 typedef u_int16_t wchar;