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 /drivers | |
parent | edbe77ba94217868caf5f391d2a083729bef3742 (diff) | |
parent | 68ca406930d6380b3be7ada5f15fcf85bfcbd552 (diff) | |
download | linux-3.10-d3b383338f105f50724c10a7d81b04a3930e886b.tar.gz linux-3.10-d3b383338f105f50724c10a7d81b04a3930e886b.tar.bz2 linux-3.10-d3b383338f105f50724c10a7d81b04a3930e886b.zip |
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 8a0ed2800e6..f336bca7c45 100644 --- a/drivers/acpi/tables.c +++ b/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 && !acpi_ht) + if (acpi_disabled) return -ENODEV; if (!handler) @@ -280,7 +280,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) struct acpi_table_header *table = NULL; acpi_size tbl_size; - if (acpi_disabled && !acpi_ht) + if (acpi_disabled) return -ENODEV; if (!handler) |