From 218b6b3fd2dabd98931a02214380592b8713ab03 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 15 Dec 2006 23:53:43 +0000 Subject: acpi can fit onto the cd ramdisks --- sys/arch/amd64/conf/RAMDISK_CD | 13 ++++++++++++- sys/arch/i386/conf/RAMDISK_CD | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 3503a111bef..22c741dc5f7 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.65 2006/12/06 23:02:36 martin Exp $ +# $OpenBSD: RAMDISK_CD,v 1.66 2006/12/15 23:53:42 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -34,6 +34,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? diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 44cfe0e42b1..8298225bfc8 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.131 2006/11/25 20:44:30 dlg Exp $ +# $OpenBSD: RAMDISK_CD,v 1.132 2006/12/15 23:53:42 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -41,6 +41,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? + cpu0 at mainbus? bios0 at mainbus0 apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 -- cgit v1.2.3