diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2007-07-02 14:29:38 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-07-02 14:29:38 +0000 |
commit | 2c15d40b6a2ec7218c827d23aa63213518db41d9 (patch) | |
tree | 6baca9bd920f9043dd216a1d92b2a00ba58c53b7 /sys/arch/i386 | |
parent | c24346fca83c8ca0b60d481bfbea5056767f748b (diff) |
allow pciide to attach to jmb as well as ahci
Diffstat (limited to 'sys/arch/i386')
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 3 |
2 files changed, 4 insertions, 2 deletions
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 |