Mechanically kill redundant nodevice/nooption/nomakeoption, i.e.,

those that do not exist in MI NOTES or switched on/off in the MD
NOTES.

4 files changed, 0 insertions, 41 deletions

diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index e2753d7..4a24104 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -811,7 +811,6 @@ nooption	DPT_LOST_IRQ
 nooption	DPT_RESET_HBA
 nooption	DPT_TIMEOUT_FACTOR
 nooption	AAC_DEBUG
-nooption	ACPI_MAX_THREADS
 
 
 #####################################################################
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 7eb72ef..d1f1bff 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -27,14 +27,9 @@ device		ofwd		# Open Firmware disks
 #####################################################################
 # Devices we don't want to deal with
 
-nodevice	atkbdc
-nodevice	atkbd
-nodevice	psm
-nodevice	vga
 nodevice	fdc
 nodevice	ppc
 # when splash works enable *_saver
-nodevice	splash
 nodevice	blank_saver
 nodevice	daemon_saver
 nodevice	dragon_saver
@@ -49,8 +44,6 @@ nodevice	warp_saver
 nodevice	daemon_saver
 nodevice	star_saver
 nodevice	snake_saver
-# needs outsw use fixed
-nodevice	cs
 # isa
 nodevice	pcii
 nodevice	tnt4882
@@ -64,13 +57,6 @@ nodevice	dcons_crom
 
 nooption 	SMP
 nooption 	GDB
-nooption	VGA_DEBUG
-nooption	VGA_WIDTH90
-nooption	VGA_SLOW_IOACCESS
-nooption	VGA_ALT_SEQACCESS
 nooption	PPC_DEBUG
 nooption	PPC_PROBE_CHIPSET
-nooption	PSM_RESETAFTERSUSPEND
-nooption	PSM_HOOKRESUME
-nooption	ATKBD_DFLT_KEYMAP
 nooption 	UKBD_DFLT_KEYMAP
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 2746e36..53983c3 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -71,10 +71,6 @@ device		atkbd
 hint.atkbd.0.at="atkbdc"
 hint.atkbd.0.irq="1"
 
-# Options for atkbd:
-options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	ATKBD_DFLT_KEYMAP=jp.106
-
 # `flags' for atkbd:
 #       0x01    Force detection of keyboard, else we always assume a keyboard
 #       0x02    Don't reset keyboard, useful for some newer ThinkPads
@@ -96,7 +92,6 @@ nodevice	fdc
 nodevice	ppc
 nodevice	snd_ad1816
 nodevice	snd_als4000
-nodevice	snd_au88x0
 nodevice	snd_cmi
 nodevice	snd_cs4281
 nodevice	snd_csa
@@ -142,7 +137,6 @@ nooption	SC_NORM_REV_ATTR
 nooption	SC_NORM_ATTR
 nooption	SC_DFLT_FONT
 nooption	SC_ALT_MOUSE_IMAGE
-nooption	ATKBD_DFLT_KEYMAP
 nooption	EXT2FS
 
 
@@ -150,4 +144,3 @@ nooption	EXT2FS
 # Make options we don't want to deal with
 
 nomakeoption	SC_DFLT_FONT
-nomakeoption	ATKBD_DFLT_KEYMAP
diff --git a/sys/sun4v/conf/NOTES b/sys/sun4v/conf/NOTES
index 5bfb3b9..27020b9 100644
--- a/sys/sun4v/conf/NOTES
+++ b/sys/sun4v/conf/NOTES
@@ -58,8 +58,6 @@ option 		OFWCONS_POLL_HZ=4 # 20 or more works best on Ultra2
 # Devices we don't want to deal with
 
 nodevice	aha
-nodevice	atkbd
-nodevice	atkbdc
 nodevice	bktr
 nodevice	blank_saver
 nodevice	bt
@@ -71,22 +69,17 @@ nodevice	ex
 nodevice	fade_saver
 nodevice	fdc
 nodevice	fire_saver
-nodevice	gpib
 nodevice	green_saver
 nodevice	hwpmc
-nodevice	isa
 nodevice	logo_saver
 nodevice	pcii
 nodevice	ppc
-nodevice	psm
 nodevice	rain_saver
 nodevice	sc
 nodevice	si
-nodevice	sio
 nodevice	snake_saver
 nodevice	snd_ad1816
 nodevice	snd_als4000
-nodevice	snd_au88x0
 nodevice	snd_cmi
 nodevice	snd_cs4281
 nodevice	snd_csa
@@ -109,12 +102,10 @@ nodevice	snd_uaudio
 nodevice	snd_via8233
 nodevice	snd_via82c686
 nodevice	snd_vibes
-nodevice	splash
 nodevice	star_saver
 nodevice	tnt4882
 nodevice	uart
 nodevice	ukbd
-nodevice	vga
 nodevice	warp_saver
 nodevice	wds
 
@@ -123,9 +114,6 @@ nodevice	wds
 # Options we don't want to deal with
 
 nooption	FDC_DEBUG
-nooption	COM_ESP
-nooption	CONSPEED
-nooption	VGA_DEBUG
 nooption	SC_RENDER_DEBUG
 nooption	SC_DEBUG_LEVEL
 nooption	PPC_DEBUG
@@ -138,12 +126,6 @@ nooption	SC_NORM_REV_ATTR
 nooption	SC_NORM_ATTR
 nooption	SC_DFLT_FONT
 nooption	SC_ALT_MOUSE_IMAGE
-nooption	VGA_WIDTH90
-nooption	VGA_SLOW_IOACCESS
-nooption	VGA_ALT_SEQACCESS
-nooption	PSM_RESETAFTERSUSPEND
-nooption	PSM_HOOKRESUME
-nooption	ATKBD_DFLT_KEYMAP
 nooption	EXT2FS
 
 
@@ -151,4 +133,3 @@ nooption	EXT2FS
 # Make options we don't want to deal with
 
 nomakeoption	SC_DFLT_FONT
-nomakeoption	ATKBD_DFLT_KEYMAP