summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-28 22:20:35 +0200
committerLen Brown <len.brown@intel.com>2010-05-28 22:20:35 +0200
commitd3b383338f105f50724c10a7d81b04a3930e886b (patch)
tree73c55f260136aa0f24571c1307a432caca4f0349 /arch/ia64/include
parentMerge branch 'misc-2.6.35' into release (diff)
parentACPI: delete the "acpi=ht" boot option (diff)
downloadlinux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.xz
linux-d3b383338f105f50724c10a7d81b04a3930e886b.zip
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/acpi.h1
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)
#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 */
-#define acpi_ht 0 /* no HT-only mode on IA64 */
#endif
#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
static inline void disable_acpi(void) { }