summaryrefslogtreecommitdiff
path: root/arch/x86/lguest
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-29 00:20:35 +0400
committerLen Brown <len.brown@intel.com>2010-05-29 00:20:35 +0400
commitd3b383338f105f50724c10a7d81b04a3930e886b (patch)
tree73c55f260136aa0f24571c1307a432caca4f0349 /arch/x86/lguest
parentedbe77ba94217868caf5f391d2a083729bef3742 (diff)
parent68ca406930d6380b3be7ada5f15fcf85bfcbd552 (diff)
downloadlinux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.xz
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'arch/x86/lguest')
-rw-r--r--arch/x86/lguest/boot.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 2bdf628066bd..9257510b4836 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1390,7 +1390,6 @@ __init void lguest_init(void)
#endif
#ifdef CONFIG_ACPI
acpi_disabled = 1;
- acpi_ht = 0;
#endif
/*