Move source tree closer to the 2.6.32.17 mainline
/drivers/acpi/tables.c
blob:f336bca7c4503ec1d03d7741ee8185afae942381 -> blob:8a0ed2800e6359a49f781b41d2afc44cd183225b
--- drivers/acpi/tables.c
+++ drivers/acpi/tables.c
@@ -213,7 +213,7 @@ acpi_table_parse_entries(char *id,
unsigned long table_end;
acpi_size tbl_size;
- if (acpi_disabled)
+ if (acpi_disabled && !acpi_ht)
return -ENODEV;
if (!handler)
@@ -280,7 +280,7 @@ int __init acpi_table_parse(char *id, ac
struct acpi_table_header *table = NULL;
acpi_size tbl_size;
- if (acpi_disabled)
+ if (acpi_disabled && !acpi_ht)
return -ENODEV;
if (!handler)