diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 10:38:48 -0700 |
| commit | 73964f6bc8e378715887592abe8a512f403db6a8 (patch) | |
| tree | c4aaab48d36ed06243542518ff644c654bdaf586 /arch/ia64 | |
| parent | 9d98ece16f1a1df0f456a2ee9429d03e82e839a2 (diff) | |
| parent | e56d953d190061938b31cabbe01b7f3d76c60bd0 (diff) | |
| download | kernel_goldelico_gta04-73964f6bc8e378715887592abe8a512f403db6a8.zip kernel_goldelico_gta04-73964f6bc8e378715887592abe8a512f403db6a8.tar.gz kernel_goldelico_gta04-73964f6bc8e378715887592abe8a512f403db6a8.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: IA64=y ACPI=n build fix
ACPI: Kill overly verbose "power state" log messages
ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
ACPI: Clarify resource conflict message
thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
Diffstat (limited to 'arch/ia64')
| -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 0f82cc2..91df968 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) { } |