diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2006-11-27 18:51:00 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2006-11-27 18:51:00 +0000 |
| commit | 435380d3700f9b57b2249e5d217dd39a92c598df (patch) | |
| tree | b4276e77aa7532c12a5c6ae44cf45ef042e7cfd4 /sys | |
| parent | 02b8664712e30327f8ff4d93a4427aafeb9923e8 (diff) | |
Add disabled acpi to GENERIC and GENERIC.MP. This is required by the new
and shiny ioapic code ketennis wrote.
ok ketennis, jordan, deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC.MP | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 7ec7f74df02..5e0e06009ce 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.541 2006/11/27 17:56:57 gwk Exp $ +# $OpenBSD: GENERIC,v 1.542 2006/11/27 18:50:59 marco Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -60,16 +60,15 @@ pci* at mainbus0 #option ACPIVERBOSE #option ACPI_ENABLE -#acpi0 at mainbus? +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? -#acpimadt* at acpi? -#acpiprt* at acpi? +acpiec* at acpi? disable +acpiprt* at acpi? #acpitz* at acpi? option PCIVERBOSE diff --git a/sys/arch/i386/conf/GENERIC.MP b/sys/arch/i386/conf/GENERIC.MP index c22b58ca90a..fb43df17baa 100644 --- a/sys/arch/i386/conf/GENERIC.MP +++ b/sys/arch/i386/conf/GENERIC.MP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC.MP,v 1.5 2005/05/01 07:54:42 david Exp $ +# $OpenBSD: GENERIC.MP,v 1.6 2006/11/27 18:50:59 marco Exp $ # # GENERIC.MP - sample multiprocessor kernel # @@ -9,3 +9,4 @@ option MULTIPROCESSOR # Multiple processor support cpu* at mainbus? ioapic* at mainbus? +acpimadt* at acpi? |