Index: sys/arm/conf/NOTES
===================================================================
--- sys/arm/conf/NOTES
+++ sys/arm/conf/NOTES
@@ -19,18 +19,6 @@
 nodevice	sym
 
 nodevice	sc
-nodevice	blank_saver
-nodevice	daemon_saver
-nodevice	dragon_saver
-nodevice	fade_saver
-nodevice	fire_saver
-nodevice	green_saver
-nodevice	logo_saver
-nodevice	rain_saver
-nodevice	snake_saver
-nodevice	star_saver
-nodevice	warp_saver
-
 nodevice	ccr
 nodevice	cxgbe
 nodevice	cxgbev
Index: sys/arm64/conf/NOTES
===================================================================
--- sys/arm64/conf/NOTES
+++ sys/arm64/conf/NOTES
@@ -211,19 +211,8 @@
 # arm64 doesn't support inb/outb, so disable chipset probing which needs it
 nooptions 	PPC_PROBE_CHIPSET
 
-# can't support syscons, no inb/outb, ditto for the screen savers
+# can't support syscons, no inb/outb
 nodevice	sc
-nodevice	blank_saver
-nodevice	daemon_saver
-nodevice	dragon_saver
-nodevice	fade_saver
-nodevice	fire_saver
-nodevice	green_saver
-nodevice	logo_saver
-nodevice	rain_saver
-nodevice	snake_saver
-nodevice	star_saver
-nodevice	warp_saver
 
 # These cause weird issues, not sure why
 nodevice	ukbd
Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES
+++ sys/conf/NOTES
@@ -1457,21 +1457,6 @@
 
 options 	FB_DEBUG		# Frame buffer debugging
 
-device		splash			# Splash screen and screen saver support
-
-# Various screen savers.
-device		blank_saver
-device		daemon_saver
-device		dragon_saver
-device		fade_saver
-device		fire_saver
-device		green_saver
-device		logo_saver
-device		rain_saver
-device		snake_saver
-device		star_saver
-device		warp_saver
-
 # The syscons console driver (SCO color console compatible).
 device		sc
 hint.sc.0.at="isa"
Index: sys/powerpc/conf/NOTES
===================================================================
--- sys/powerpc/conf/NOTES
+++ sys/powerpc/conf/NOTES
@@ -82,22 +82,6 @@
 nodevice	mpr		# no 64-bit atomics
 nodevice	mps		# no 64-bit atomics
 nodevice	ppc
-nodevice	splash
-# when splash works enable *_saver
-nodevice	blank_saver
-nodevice	daemon_saver
-nodevice	dragon_saver
-nodevice	fade_saver
-nodevice	fire_saver
-nodevice	green_saver
-nodevice	logo_saver
-nodevice	rain_saver
-nodevice	snake_saver
-nodevice	star_saver
-nodevice	warp_saver
-nodevice	daemon_saver
-nodevice	star_saver
-nodevice	snake_saver
 # sound
 nodevice	snd_cmi
 # wants gdb_cur
Index: sys/sparc64/conf/NOTES
===================================================================
--- sys/sparc64/conf/NOTES
+++ sys/sparc64/conf/NOTES
@@ -89,9 +89,6 @@
 #####################################################################
 # Devices we don't want to deal with
 
-nodevice	daemon_saver
-nodevice	snake_saver
-nodevice	star_saver
 nodevice	bktr
 nodevice	fdc
 nodevice	ppc
Index: sys/x86/conf/NOTES
===================================================================
--- sys/x86/conf/NOTES
+++ sys/x86/conf/NOTES
@@ -11,3 +11,22 @@
 # FreeBSD.  Needed for FreeBSD a.out support. Unneeded for ELF
 # versions of FreeBSD.
 options 	COMPAT_43
+
+#####################################################################
+# HARDWARE DEVICE CONFIGURATION
+
+device		splash			# Splash screen and screen saver support
+
+# Various screen savers.
+device		blank_saver
+device		daemon_saver
+device		dragon_saver
+device		fade_saver
+device		fire_saver
+device		green_saver
+device		logo_saver
+device		rain_saver
+device		snake_saver
+device		star_saver
+device		warp_saver
+