enable jmb on all archs that support ahci, so jmicron boards will continue

to work (and work better in the future)

5 files changed, 15 insertions, 5 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ba40672ae35..8f900ecfd2a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.187 2007/05/31 23:18:25 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.188 2007/07/02 01:18:30 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -259,6 +259,8 @@ lpt*	at puc?
 #scsibus* at bha?
 ahc*	at pci?				# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
+jmb*	at pci?				# JMicron JMB36x controllers
+ahci*	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 bd0e1c6a2ca..c0dd853013b 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.73 2007/04/25 21:40:35 deraadt Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.74 2007/07/02 01:18:30 dlg Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -152,6 +152,8 @@ com2	at isa? port 0x3e8 irq 5
 #scsibus* at bha?
 ahc*	at pci?			# Adaptec 2940 SCSI controllers
 scsibus* at ahc?
+jmb*	at pci?			# JMicron JMB36x controllers
+ahci*	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 478c8b76e7b..ed0e2ae9f83 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.565 2007/05/31 23:18:25 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.566 2007/07/02 01:18:30 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -358,6 +358,8 @@ scsibus* at ahb?
 ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 scsibus* at ahc?
+jmb*	at pci?			# JMicron JMB36x controllers
+ahci*	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 f8476b74cc7..f75043b9169 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.140 2007/05/29 18:18:19 tom Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.141 2007/07/02 01:18:30 dlg Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -196,6 +196,8 @@ scsibus* at ahb?
 ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 scsibus* at ahc?
+jmb*	at pci?			# JMicron JMB36x controllers
+ahci*	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 68170d3e11d..f6be253daa8 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.181 2007/07/01 16:55:01 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.182 2007/07/02 01:18:30 dlg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -90,6 +90,8 @@ mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
 scsibus* at mpi?
 arc*	at pci?			# Areca RAID Controllers
 scsibus* at arc?
+jmb*	at pci?			# JMicron JMB36x controllers
+ahci*	at jmb?
 ahci*	at pci?			# AHCI SATA controllers
 scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers