diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-27 04:17:21 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-27 04:17:21 -0400 |
| commit | e56d953d190061938b31cabbe01b7f3d76c60bd0 (patch) | |
| tree | a086109960584c7f88d8936eac76ad3c30274f4e /arch/ia64/include/asm/acpi.h | |
| parent | 3d5b6fb47a8e68fa311ca2c3447e7f8a7c3a9cf3 (diff) | |
| download | linux-e56d953d190061938b31cabbe01b7f3d76c60bd0.tar.gz linux-e56d953d190061938b31cabbe01b7f3d76c60bd0.tar.bz2 linux-e56d953d190061938b31cabbe01b7f3d76c60bd0.zip | |
ACPI: IA64=y ACPI=n build fix
ia64's sim_defconfig uses CONFIG_ACPI=n
which now #define's acpi_disabled in <linux/acpi.h>
So we shouldn't re-define it here in <asm/acpi.h>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 0f82cc2934e1..91df9686a0da 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -89,10 +89,12 @@ ia64_acpi_release_global_lock (unsigned int *lock) #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) +#ifdef CONFIG_ACPI #define acpi_disabled 0 /* ACPI always enabled on IA64 */ #define acpi_noirq 0 /* ACPI always enabled on IA64 */ #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ +#endif #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ static inline void disable_acpi(void) { } |