Merge branch 'ht-delete-2.6.35' into release

[net-next-2.6.git] / arch / x86 / lguest / boot.c

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 2bdf628066bd85288bf8143d50175d4f7ea6b398..9257510b4836837eb4cdff719000b716ff3bdd63 100644 (file)
--- 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
 
        /*