kill mcd dead. ok krw matthew millert thib

6 files changed, 6 insertions, 17 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3f5b6db6584..a258198f689 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.718 2011/06/20 06:07:26 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.719 2011/06/26 23:19:10 tedu Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -528,8 +528,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370
 fd*	at fdc? flags 0x00
 
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
 # IDE controllers
 pciide* at pci? flags 0x0000
 
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index b4603c5c3e9..7f66abe339d 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.174 2011/06/06 06:15:02 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.175 2011/06/26 23:19:10 tedu Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -176,8 +176,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370
 fd*	at fdc?
 
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
 # IDE controllers
 pciide* at pci? flags 0x0000
 
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 97b164de6cd..623d23e1444 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.117 2011/01/07 19:33:08 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.118 2011/06/26 23:19:10 tedu Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -194,8 +194,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370
 fd*	at fdc?
 
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
 # IDE controllers
 pciide* at pci? flags 0x0000
 
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 7fb060607f9..3bcda19b9cd 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.98 2011/05/24 20:27:11 matthew Exp $
+#	$OpenBSD: RAMDISKC,v 1.99 2011/06/26 23:19:10 tedu Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -211,8 +211,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370
 fd*	at fdc?
 
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
 # IDE controllers
 pciide* at pci? flags 0x0000
 
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index a0dc6d142f2..f3f8a9116de 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.187 2011/05/24 20:27:11 matthew Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.188 2011/06/26 23:19:10 tedu Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -279,8 +279,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370
 fd*	at fdc?
 
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
 # IDE controllers
 pciide* at pci? flags 0x0000
 
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 6c655e0d050..d2d98845dce 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.203 2011/05/23 09:54:20 claudio Exp $
+#	$OpenBSD: files.i386,v 1.204 2011/06/26 23:19:10 tedu Exp $
 #
 # new style config file for i386 architecture
 #
@@ -181,7 +181,6 @@ file	dev/pci/if_hme_pci.c		hme_pci
 # ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers
 #
 
-major	{mcd = 7}
 major	{wd = 0}
 
 include "dev/isa/files.isa"