diff options
| author | Len Brown <len.brown@intel.com> | 2010-05-28 16:20:35 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-05-28 16:20:35 -0400 |
| commit | d3b383338f105f50724c10a7d81b04a3930e886b (patch) | |
| tree | 73c55f260136aa0f24571c1307a432caca4f0349 /arch/ia64 | |
| parent | edbe77ba94217868caf5f391d2a083729bef3742 (diff) | |
| parent | 68ca406930d6380b3be7ada5f15fcf85bfcbd552 (diff) | |
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 21adbd7f90f8..837dc82a013e 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h | |||
| @@ -94,7 +94,6 @@ ia64_acpi_release_global_lock (unsigned int *lock) | |||
| 94 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ | 94 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ |
| 95 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ | 95 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ |
| 96 | #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ | 96 | #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ |
| 97 | #define acpi_ht 0 /* no HT-only mode on IA64 */ | ||
| 98 | #endif | 97 | #endif |
| 99 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ | 98 | #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ |
| 100 | static inline void disable_acpi(void) { } | 99 | static inline void disable_acpi(void) { } |