From f289e4f956063a8bf5e6cd04213ab2ce003df593 Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Wed, 21 Mar 2007 02:14:07 +0000 Subject: enable ahci(4). this only attaches to the jmicron controllers so far. if anyone can quickly try this on i386 i'll enable it there too. ok deraadt@ --- sys/arch/amd64/conf/GENERIC | 4 +++- sys/arch/amd64/conf/RAMDISK_CD | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 2cabf973bb9..78267796776 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.175 2007/03/17 03:12:22 jsg Exp $ +# $OpenBSD: GENERIC,v 1.176 2007/03/21 02:14:06 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -254,6 +254,8 @@ lpt* at puc? #scsibus* at bha? ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? +ahci* at pci? # AHCI SATA controllers +scsibus* at ahci? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? arc* at pci? # Areca RAID Controller diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 9d1a4c3da49..2f9c4f5a71d 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.70 2007/02/20 11:42:41 tom Exp $ +# $OpenBSD: RAMDISK_CD,v 1.71 2007/03/21 02:14:06 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? +ahci* at pci? # AHCI SATA controllers +scsibus* at ahci? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? arc* at pci? # Areca RAID Controller -- cgit v1.2.3