allow pciide to attach to jmb as well as ahci

6 files changed, 12 insertions, 6 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8f900ecfd2a..6efa1d15ce0 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.188 2007/07/02 01:18:30 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.189 2007/07/02 14:29:37 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -261,6 +261,7 @@ ahc*	at pci?				# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
 jmb*	at pci?				# JMicron JMB36x controllers
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?				# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?				# Silicon Image 3124/3132/3531 SATA
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index c0dd853013b..a907c9a3fe5 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.74 2007/07/02 01:18:30 dlg Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.75 2007/07/02 14:29:37 dlg Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -154,6 +154,7 @@ ahc*	at pci?			# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
 jmb*	at pci?			# JMicron JMB36x controllers
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?			# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index ed0e2ae9f83..c541c040c8c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.566 2007/07/02 01:18:30 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.567 2007/07/02 14:29:37 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -360,6 +360,7 @@ ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 scsibus* at ahc?
 jmb*	at pci?			# JMicron JMB36x controllers
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?			# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index f75043b9169..15fef3efd18 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.141 2007/07/02 01:18:30 dlg Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.142 2007/07/02 14:29:37 dlg Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -198,6 +198,7 @@ ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 scsibus* at ahc?
 jmb*	at pci?			# JMicron JMB36x controllers
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?			# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index f6be253daa8..855a0584362 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.182 2007/07/02 01:18:30 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.183 2007/07/02 14:29:37 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -92,6 +92,7 @@ arc*	at pci?			# Areca RAID Controllers
 scsibus* at arc?
 jmb*	at pci?			# JMicron JMB36x controllers
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?			# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index da92fdfec51..45f5733ebd6 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.65 2007/07/02 02:28:12 jsg Exp $
+#	$OpenBSD: RAMDISK,v 1.66 2007/07/02 14:29:37 dlg Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -131,6 +131,7 @@ sili*	at pci?
 arc*	at pci?
 jmb*	at pci?
 ahci*	at jmb?
+pciide*	at jmb?
 ahci*	at pci?
 
 option ISP_COMPILE_FW=1