diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index c3fc809954e..978aba9f375 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.19 1994/11/17 20:20:53 gibbs Exp $
+#	$Id: GENERIC,v 1.20 1994/11/18 19:10:25 jkh Exp $
 #
 
 machine		"i386"
@@ -56,12 +56,8 @@ controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
 controller	scbus0
 
 device		sd0
-device		sd1
-device		sd2
-device		sd3
 
 device		st0
-device		st1
 
 device		cd0	#Only need one of these, the code dynamically grows
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 87dfb66f106..f0adb9977ca 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.115 1994/12/13 20:56:30 wollman Exp $
+#	$Id: LINT,v 1.116 1994/12/13 22:01:35 wollman Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -249,11 +249,7 @@ options		QUOTA			#enable disk quotas
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
 device		sd0	#SCSI disks
-device		sd1
-device		sd2
-device		sd3
 device		st0	#SCSI tapes
-device		st1
 device		uk0			#unknown scsi devices
 
 #
@@ -277,7 +273,7 @@ pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
 pseudo-device	log		#Kernel syslog interface (/dev/klog)
 pseudo-device	gzip		#Exec gzipped a.out's
 
-pseudo-device	vn	4	#Vnode driver (turns a file into a device)
+pseudo-device	vn		#Vnode driver (turns a file into a device)
 
 
 #####################################################################
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index c3fc809954e..978aba9f375 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.19 1994/11/17 20:20:53 gibbs Exp $
+#	$Id: GENERIC,v 1.20 1994/11/18 19:10:25 jkh Exp $
 #
 
 machine		"i386"
@@ -56,12 +56,8 @@ controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
 controller	scbus0
 
 device		sd0
-device		sd1
-device		sd2
-device		sd3
 
 device		st0
-device		st1
 
 device		cd0	#Only need one of these, the code dynamically grows
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 87dfb66f106..f0adb9977ca 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.115 1994/12/13 20:56:30 wollman Exp $
+#	$Id: LINT,v 1.116 1994/12/13 22:01:35 wollman Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -249,11 +249,7 @@ options		QUOTA			#enable disk quotas
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
 device		sd0	#SCSI disks
-device		sd1
-device		sd2
-device		sd3
 device		st0	#SCSI tapes
-device		st1
 device		uk0			#unknown scsi devices
 
 #
@@ -277,7 +273,7 @@ pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
 pseudo-device	log		#Kernel syslog interface (/dev/klog)
 pseudo-device	gzip		#Exec gzipped a.out's
 
-pseudo-device	vn	4	#Vnode driver (turns a file into a device)
+pseudo-device	vn		#Vnode driver (turns a file into a device)
 
 
 #####################################################################
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 87dfb66f106..f0adb9977ca 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.115 1994/12/13 20:56:30 wollman Exp $
+#	$Id: LINT,v 1.116 1994/12/13 22:01:35 wollman Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -249,11 +249,7 @@ options		QUOTA			#enable disk quotas
 controller	scbus0	#base SCSI code
 device		ch0	#SCSI media changers
 device		sd0	#SCSI disks
-device		sd1
-device		sd2
-device		sd3
 device		st0	#SCSI tapes
-device		st1
 device		uk0			#unknown scsi devices
 
 #
@@ -277,7 +273,7 @@ pseudo-device	speaker		#Play IBM BASIC-style noises out your speaker
 pseudo-device	log		#Kernel syslog interface (/dev/klog)
 pseudo-device	gzip		#Exec gzipped a.out's
 
-pseudo-device	vn	4	#Vnode driver (turns a file into a device)
+pseudo-device	vn		#Vnode driver (turns a file into a device)
 
 
 #####################################################################