diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 36ca21f19fa..78715660e1b 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.147 2007/02/17 03:16:26 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.148 2007/02/17 23:59:03 marco Exp $ machine i386 # architecture, used by config; REQUIRED @@ -46,7 +46,7 @@ acpi0 at mainbus? disable #acpibat* at acpi? #acpibtn* at acpi? #acpicpu* at acpi? -acpiec* at acpi? disable +#acpiec* at acpi? acpiprt* at acpi? #acpitz* at acpi? diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 34cf7f3f3df..3efc9e35c9a 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.94 2006/12/20 03:31:33 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.95 2007/02/17 23:59:03 marco Exp $ machine i386 # architecture, used by config; REQUIRED @@ -46,7 +46,7 @@ acpi0 at mainbus? disable #acpibat* at acpi? #acpibtn* at acpi? #acpicpu* at acpi? -acpiec* at acpi? disable +#acpiec* at acpi? acpiprt* at acpi? #acpitz* at acpi? diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index c1027ffd5d9..a244389bfc7 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.71 2006/12/20 03:32:20 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.72 2007/02/17 23:59:03 marco Exp $ machine i386 # architecture, used by config; REQUIRED @@ -46,7 +46,7 @@ acpi0 at mainbus? disable #acpibat* at acpi? #acpibtn* at acpi? #acpicpu* at acpi? -acpiec* at acpi? disable +#acpiec* at acpi? acpiprt* at acpi? #acpitz* at acpi? diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 79b6beedac9..a9cd3b50b86 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.134 2007/02/04 23:30:19 jsg Exp $ +# $OpenBSD: RAMDISK_CD,v 1.135 2007/02/17 23:59:03 marco Exp $ machine i386 # architecture, used by config; REQUIRED @@ -48,7 +48,7 @@ acpi0 at mainbus? disable #acpibat* at acpi? #acpibtn* at acpi? #acpicpu* at acpi? -acpiec* at acpi? disable +#acpiec* at acpi? acpiprt* at acpi? #acpitz* at acpi? diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 838e9e45ce0..60f984e5f38 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.376 2007/02/17 17:38:37 tom Exp $ */ +/* $OpenBSD: machdep.c,v 1.377 2007/02/17 23:59:03 marco Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2456,7 +2456,7 @@ haltsys: doshutdownhooks(); if (howto & RB_HALT) { -#if NACPI > 0 +#if NACPI > 0 && !defined(SMALL_KERNEL) extern int acpi_s5, acpi_enabled; if (acpi_enabled) { |