Index: conf/options
===================================================================
RCS file: /home/ncvs/src/sys/conf/options,v
retrieving revision 1.385
diff -u -r1.385 options
--- conf/options	26 Mar 2003 23:40:41 -0000	1.385
+++ conf/options	2 Apr 2003 19:09:00 -0000
@@ -72,7 +72,7 @@
 					# mapped I/O
 
 # Miscellaneous options.
-ALQ		opt_alq.h
+ALQ
 ADAPTIVE_MUTEXES
 COMPAT_43	opt_compat.h
 COMPAT_FREEBSD4	opt_compat.h
@@ -153,7 +153,7 @@
 # SECURITY POLICY PARAMETERS
 
 # Support for Mandatory Access Control (MAC)
-MAC		opt_mac.h
+MAC
 MAC_BIBA	opt_dontuse.h
 MAC_BSDEXTENDED	opt_dontuse.h
 MAC_DEBUG	opt_mac.h
@@ -349,10 +349,10 @@
 IPV6FIREWALL_VERBOSE_LIMIT	opt_ip6fw.h
 IPV6FIREWALL_DEFAULT_TO_ACCEPT	opt_ip6fw.h
 IPSTEALTH
-IPX			opt_ipx.h
+IPX
 IPXIP			opt_ipx.h
 LIBMCHAIN
-NCP			opt_ncp.h
+NCP
 NETATALK		opt_atalk.h
 PPP_BSDCOMP		opt_ppp.h
 PPP_DEFLATE		opt_ppp.h
@@ -417,7 +417,7 @@
 
 # XXX Conflict: # of devices vs network protocol (Native ATM).
 # This makes "atm.h" unusable.
-NATM			opt_natm.h
+NATM
 
 DPT_ALLOW_MEMIO		opt_dpt.h	# Allow PCI devices to use memory
 					# mapped I/O
Index: conf/options.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.i386,v
retrieving revision 1.189
diff -u -r1.189 options.i386
--- conf/options.i386	4 Apr 2003 23:54:46 -0000	1.189
+++ conf/options.i386	7 Apr 2003 23:30:11 -0000
@@ -110,7 +110,7 @@
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
-VESA			opt_vesa.h
+VESA
 VESA_DEBUG		opt_vesa.h
 
 PSM_HOOKRESUME		opt_psm.h
Index: conf/options.ia64
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.ia64,v
retrieving revision 1.16
diff -u -r1.16 options.ia64
--- conf/options.ia64	24 Nov 2002 19:50:15 -0000	1.16
+++ conf/options.ia64	2 Apr 2003 19:09:51 -0000
@@ -4,7 +4,7 @@
 ITANIUM			opt_global.h
 ITANIUM2		opt_global.h
 
-IA32			opt_ia32.h
+IA32
 
 PAGE_SIZE_4K		opt_global.h
 PAGE_SIZE_8K		opt_global.h
Index: conf/options.pc98
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.pc98,v
retrieving revision 1.161
diff -u -r1.161 options.pc98
--- conf/options.pc98	3 Apr 2003 12:39:51 -0000	1.161
+++ conf/options.pc98	7 Apr 2003 23:30:11 -0000
@@ -94,7 +94,7 @@
 SC_TWOBUTTON_MOUSE	opt_syscons.h
 SC_NO_SUSPEND_VTYSWITCH	opt_syscons.h
 
-GDC			opt_gdc.h
+GDC
 
 KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
 KBD_INSTALL_CDEV	opt_kbd.h
Index: conf/options.powerpc
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.powerpc,v
retrieving revision 1.6
diff -u -r1.6 options.powerpc
--- conf/options.powerpc	5 Feb 2003 11:37:58 -0000	1.6
+++ conf/options.powerpc	2 Apr 2003 19:10:54 -0000
@@ -2,7 +2,7 @@
 # Options specific to the powerpc platform kernels
 
 OEA			opt_global.h
-IPKDB			opt_ipkdb.h
+IPKDB
 
 POWERMAC		opt_platform.h
-PSIM			opt_psim.h
+PSIM
Index: conf/options.x86_64
===================================================================
RCS file: /home/ncvs/src/sys/conf/options.x86_64,v
retrieving revision 1.4
diff -u -r1.4 options.x86_64
--- conf/options.x86_64	18 Nov 2002 06:17:07 -0000	1.4
+++ conf/options.x86_64	2 Apr 2003 19:10:17 -0000
@@ -40,7 +40,7 @@
 VGA_SLOW_IOACCESS	opt_vga.h
 VGA_WIDTH90		opt_vga.h
 
-VESA			opt_vesa.h
+VESA
 VESA_DEBUG		opt_vesa.h
 
 ATKBD_DFLT_KEYMAP	opt_atkbd.h