summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-07-02 01:18:31 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-07-02 01:18:31 +0000
commita06cf9d64658f65a4084308f4710f3afa6525851 (patch)
tree57f9d8e1a5c7d314e8fcc587fa24357a14e66613 /sys/arch/amd64
parent04e6c2790e0858a959541d05a7dc783b721a16a5 (diff)
enable jmb on all archs that support ahci, so jmicron boards will continue
to work (and work better in the future)
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 6 insertions, 2 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