aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/acpi.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-07 10:43:36 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-07 10:43:36 +1100
commit6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch)
treefd475ac8f57a6bd39c976056324d1bc79d11b4c9 /include/asm-i386/acpi.h
parent[PATCH] sem2mutex: drivers/macintosh/windfarm_core.c (diff)
parent[PATCH] USB: Fix GPL markings on usb core functions. (diff)
downloadlinux-dev-6cb6524d90b6e5497e79a1474bdb2f26755d1c02.tar.xz
linux-dev-6cb6524d90b6e5497e79a1474bdb2f26755d1c02.zip
Merge ../linux-2.6
Diffstat (limited to 'include/asm-i386/acpi.h')
-rw-r--r--include/asm-i386/acpi.h2
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__*/