git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ht-delete-2.6.35' into release
[pandora-kernel.git]
/
arch
/
x86
/
lguest
/
boot.c
diff --git
a/arch/x86/lguest/boot.c
b/arch/x86/lguest/boot.c
index
2bdf628
..
9257510
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
/*