diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:06:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:06:15 +0100 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /include/asm-i386 | |
| parent | [PATCH] compat: fix compat_sys_openat and friends (diff) | |
| parent | [ACPI] ACPICA 20060127 (diff) | |
| download | linux-59ed2f59e4ea6a32f9591e378da7935f713a7000.tar.xz linux-59ed2f59e4ea6a32f9591e378da7935f713a7000.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index df4ed323aa4d..55059abf9c95 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -179,7 +179,7 @@ extern void acpi_reserve_bootmem(void); extern u8 x86_acpiid_to_apicid[]; -#define ARCH_HAS_POWER_PDC_INIT 1 +#define ARCH_HAS_POWER_INIT 1 #endif /*__KERNEL__*/ |