diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 8439fcbe08c7..7235d2a915b0 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -113,7 +113,7 @@ device		amr		# AMI MegaRAID
 device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# AT keyboard controller
+device		atkbdc		# AT keyboard controller
 device		atkbd		# AT keyboard
 device		psm		# PS/2 mouse
 
@@ -123,7 +123,7 @@ device		tga		# TGA video card driver
 device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
 
 device		mcclock		# MC146818 real time clock device
 
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 089d0afe70b0..aef7f431d47b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -125,7 +125,7 @@ device		mlx		# Mylex DAC960 family
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# AT keyboard controller
+device		atkbdc		# AT keyboard controller
 device		atkbd		# AT keyboard
 device		psm		# PS/2 mouse
 
@@ -134,7 +134,7 @@ device		vga		# VGA video card driver
 device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
 
 # Enable this for the pcvt (VT220 compatible) console driver
 #device		vt
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a533ebbfabb0..34523ac87e76 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -965,7 +965,7 @@ options 	MSGBUF_SIZE=40960
 #
 
 # The keyboard controller; it controls the keyboard and the PS/2 mouse.
-device		atkbdc	1
+device		atkbdc
 hint.atkbdc.0.at="isa"
 hint.atkbdc.0.port="0x060"
 
@@ -1038,7 +1038,7 @@ device		star_saver
 device		warp_saver
 
 # The syscons console driver (sco color console compatible).
-device		sc	1
+device		sc
 hint.sc.0.at="isa"
 options 	MAXCONS=16		# number of virtual consoles
 options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 089d0afe70b0..aef7f431d47b 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -125,7 +125,7 @@ device		mlx		# Mylex DAC960 family
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# AT keyboard controller
+device		atkbdc		# AT keyboard controller
 device		atkbd		# AT keyboard
 device		psm		# PS/2 mouse
 
@@ -134,7 +134,7 @@ device		vga		# VGA video card driver
 device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
 
 # Enable this for the pcvt (VT220 compatible) console driver
 #device		vt
diff --git a/sys/i386/conf/OLDCARD b/sys/i386/conf/OLDCARD
index 68bf3560cdd3..596b66c2f2ff 100644
--- a/sys/i386/conf/OLDCARD
+++ b/sys/i386/conf/OLDCARD
@@ -123,7 +123,7 @@ device		mlx		# Mylex DAC960 family
 device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# At keyboard controller
+device		atkbdc		# At keyboard controller
 device		atkbd		# at keyboard
 device		psm		# psm mouse
 
@@ -133,7 +133,7 @@ device		vga		# VGA screen
 device		splash
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
 
 # Enable this for the pcvt (VT220 compatible) console driver
 #device		vt
@@ -211,7 +211,7 @@ device		random		# Entropy device
 device		loop		# Network loopback
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
-device		ppp	1	# Kernel PPP
+device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 164b6175d191..9dfbb4a5cb3d 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -100,7 +100,7 @@ device		amr		# AMI MegaRAID
 device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc	1	# AT keyboard controller
+device		atkbdc		# AT keyboard controller
 device		atkbd		# AT keyboard
 device		psm		# PS/2 mouse
 
@@ -109,7 +109,7 @@ device		vga		# VGA video card driver
 device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-#device		sc	1
+#device		sc
 
 # Serial (COM) ports
 device		sio
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e7de87e26b8d..8b37a1b52e5a 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -113,14 +113,14 @@ device		pass		# Passthrough device (direct SCSI access)
 device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # keyboard driver
-device		pckbd	1	# PC98 keyboard
+device		pckbd		# PC98 keyboard
 
 device		gdc		# GDC screen
 
 device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-device		sc	1
+device		sc
 
 # Floating point support - do not disable.
 device		npx
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 1c2827db2070..748f567f9598 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -107,7 +107,7 @@ device		pass		# Passthrough device (direct SCSI access)
 #device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-#device		atkbdc	1	# AT keyboard controller
+#device		atkbdc		# AT keyboard controller
 #device		atkbd		# AT keyboard
 #device		psm		# PS/2 mouse
 
@@ -116,7 +116,7 @@ device		pass		# Passthrough device (direct SCSI access)
 #device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-#device		sc	1
+#device		sc
 
 device		ofw_console	# OpenBoot firmware console device