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/x86/lguest | |
| parent | edbe77ba94217868caf5f391d2a083729bef3742 (diff) | |
| parent | 68ca406930d6380b3be7ada5f15fcf85bfcbd552 (diff) | |
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'arch/x86/lguest')
| -rw-r--r-- | arch/x86/lguest/boot.c | 1 |
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) | |||
| 1390 | #endif | 1390 | #endif |
| 1391 | #ifdef CONFIG_ACPI | 1391 | #ifdef CONFIG_ACPI |
| 1392 | acpi_disabled = 1; | 1392 | acpi_disabled = 1; |
| 1393 | acpi_ht = 0; | ||
| 1394 | #endif | 1393 | #endif |
| 1395 | 1394 | ||
| 1396 | /* | 1395 | /* |