summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-12-20 03:33:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-12-20 03:33:13 +0000
commit1e94b05aa2f35d22d655228c317d6cd5c65945ba (patch)
tree8c294cfdf05e2ac683c81ce29fb6ea5038b5f0ad /sys/arch/amd64
parent0fc8b519e83ee108eecd5dad0b6807b86e439411 (diff)
acpi fits when we decide that it is more important than ahc(4) adaptec
scsi support (note that ahd was never even there...).
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/RAMDISK23
1 files changed, 17 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index c0fbfbdba0a..3f75a52eeff 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.35 2006/11/25 20:44:30 dlg Exp $
+# $OpenBSD: RAMDISK,v 1.36 2006/12/20 03:33:12 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -33,6 +33,17 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b
mainbus0 at root
+acpi0 at mainbus? disable
+#acpitimer* at acpi?
+#acpihpet* at acpi?
+#acpiac* at acpi?
+#acpibat* at acpi?
+#acpibtn* at acpi?
+#acpicpu* at acpi?
+acpiec* at acpi? disable
+acpiprt* at acpi?
+#acpitz* at acpi?
+
cpu* at mainbus0
isa0 at mainbus0
#isa0 at pcib?
@@ -119,8 +130,8 @@ com1 at isa? port 0x2f8 irq 3
#bha* at pci?
#scsibus* at bha?
-ahc* at pci? # Adaptec 2940 SCSI controllers
-scsibus* at ahc?
+#ahc* at pci? # Adaptec 2940 SCSI controllers
+#scsibus* at ahc?
#ahd* at pci? # Adaptec 79?? SCSI controllers
#scsibus* at ahd?
mpi* at pci? # LSI Logic Message Passing Interface
@@ -131,7 +142,7 @@ scsibus* at mpi?
#scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
scsibus* at ami?
-mfi* at pci? # LSI MegaRAID SAS controllers
+mfi* at pci? # LSI MegaRAID SAS controllers
scsibus* at mfi?
#cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
#scsibus* at cac?
@@ -158,7 +169,7 @@ scsibus* at mfi?
# I2O
#iop* at pci? # I2O processor
-#ioprbs* at iop? # I2O arrays
+#ioprbs* at iop? # I2O arrays
#scsibus* at ioprbs?
#iopsp* at iop? # I2O SCSI pass-through
#scsibus* at iopsp?
@@ -218,7 +229,7 @@ bge* at pci? # Broadcom BCM570x (aka Tigon3)
#mtd* at pci? # Myson MTD803
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
-pcn* at pci? # AMD PCnet-PCI Ethernet
+#pcn* at pci? # AMD PCnet-PCI Ethernet
# Wireless network cards
#wi* at pci? # WaveLAN IEEE 802.11DS