From a06cf9d64658f65a4084308f4710f3afa6525851 Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Mon, 2 Jul 2007 01:18:31 +0000 Subject: enable jmb on all archs that support ahci, so jmicron boards will continue to work (and work better in the future) --- sys/arch/i386/conf/GENERIC | 4 +++- sys/arch/i386/conf/RAMDISK_CD | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sys/arch/i386/conf') 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 -- cgit v1.2.3