Garbage-collect options ACPI_NO_ENABLE_ON_BOOT, AML_DEBUG, BLEED,

DEVICE_SYSCTLS, KEY, LOUTB, NFS_MUIDHASHSIZ, NFS_UIDHASHSIZ, PCI_QUIET
and SIMPLELOCK_DEBUG.

2 files changed, 0 insertions, 20 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 1e770bd..eeec5e8 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -807,9 +807,7 @@ options 	NFS_MAXATTRTIMO=60
 options 	NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
 options 	NFS_MAXDIRATTRTIMO=60
 options 	NFS_GATHERDELAY=10	# Default write gather delay (msec)
-options 	NFS_UIDHASHSIZ=29	# Tune the size of nfssvc_sock with this
 options 	NFS_WDELAYHASHSIZ=16	# and with this
-options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
 options 	NFS_DEBUG		# Enable NFS Debugging
 
 # Coda stuff:
@@ -1172,7 +1170,6 @@ device		agp
 #
 #Enable pci resources left off by a "lazy" BIOS:
 options 	PCI_ENABLE_IO_MODES
-#options 	PCI_QUIET	#quiets PCI code on chipset settings
 
 
 #####################################################################
@@ -2088,7 +2085,6 @@ hint.pca.0.port="0x040"
 # asc: GI1904-based hand scanners, e.g. the Trust Amiscan Grey
 # gsc: Genius GS-4500 hand scanner.
 # joy: joystick (including IO DATA PCJOY PC Card joystick)
-# The LOUTB option specifies a slower outb() for debugging purposes. 
 # rc: RISCom/8 multiport card
 # rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
@@ -2973,9 +2969,6 @@ options 	KBD_MAXRETRY=4
 options 	KBD_MAXWAIT=6
 options 	KBD_RESETDELAY=201
 
-# Enable the PF_KEY Key Management API.
-options 	KEY
-
 # Kernel filelock debugging.
 options 	LOCKF_DEBUG
 
@@ -3004,7 +2997,6 @@ options 	SC_DEBUG_LEVEL=5	# Syscons debug level
 options 	SC_RENDER_DEBUG	# syscons rendering debugging
 
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
-options 	SIMPLELOCK_DEBUG
 options 	SLIP_IFF_OPTS
 options 	TIMER_FREQ="((14318182+6)/12)"
 options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
diff --git a/sys/conf/options b/sys/conf/options
index 5692e17..1c538f7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -56,7 +56,6 @@ ADW_ALLOW_MEMIO		opt_adw.h	# Allow PCI devices to use memory
 					# mapped I/O
 
 # Miscellaneous options.
-BLEED
 COMPAT_43	opt_compat.h
 COMPAT_SUNOS	opt_compat.h
 COMPILING_LINT	opt_global.h
@@ -363,7 +362,6 @@ VP0_DEBUG		opt_vpo.h
 LPT_DEBUG		opt_lpt.h
 PLIP_DEBUG		opt_plip.h
 LOCKF_DEBUG		opt_debug_lockf.h
-LOUTB			opt_debug_outb.h
 NPX_DEBUG		opt_debug_npx.h
 NETATALKDEBUG		opt_atalk.h
 SI_DEBUG		opt_debug_si.h
@@ -390,7 +388,6 @@ INVARIANT_SUPPORT	opt_global.h
 INVARIANTS		opt_global.h
 REGRESSION		opt_global.h
 RESTARTABLE_PANICS	opt_global.h
-SIMPLELOCK_DEBUG	opt_global.h
 VFS_BIO_DEBUG		opt_global.h
 
 # These are VM related options
@@ -408,14 +405,10 @@ PQ_CACHESIZE		opt_vmpage.h
 # Standard SMP options
 SMP			opt_global.h
 
-# sys/netkey
-KEY
-
 # Size of the kernel message buffer
 MSGBUF_SIZE		opt_msgbuf.h
 
 # PCI related options
-PCI_QUIET		opt_pci.h
 PCI_ENABLE_IO_MODES	opt_pci.h
 PCI_ALLOW_UNSUPPORTED_IO_RANGE	opt_pci.h
 
@@ -425,9 +418,7 @@ NFS_MAXATTRTIMO		opt_nfs.h
 NFS_MINDIRATTRTIMO	opt_nfs.h
 NFS_MAXDIRATTRTIMO	opt_nfs.h
 NFS_GATHERDELAY		opt_nfs.h
-NFS_UIDHASHSIZ		opt_nfs.h
 NFS_WDELAYHASHSIZ	opt_nfs.h
-NFS_MUIDHASHSIZ		opt_nfs.h
 NFS_DEBUG		opt_nfs.h
 
 # For the Bt848/Bt848A/Bt849/Bt878/Bt879 driver
@@ -468,7 +459,6 @@ SIMOS			opt_simos.h
 
 # options for bus/device framework
 BUS_DEBUG		opt_bus.h
-DEVICE_SYSCTLS		opt_bus.h
 
 # options for USB support
 UHCI_DEBUG		opt_usb.h
@@ -512,8 +502,6 @@ WITNESS_SKIPSPIN	opt_witness.h
 
 # options for ACPI support
 ACPI_DEBUG		opt_acpi.h
-AML_DEBUG		opt_acpi.h
-ACPI_NO_ENABLE_ON_BOOT	opt_acpi.h
 ACPI_NO_SEMAPHORES	opt_acpi.h
 ACPI_MAX_THREADS	opt_acpi.h