diff options
| author | Len Brown | 2010-05-28 22:20:35 +0200 |
|---|---|---|
| committer | Len Brown | 2010-05-28 22:20:35 +0200 |
| commit | d3b383338f105f50724c10a7d81b04a3930e886b (patch) | |
| tree | 73c55f260136aa0f24571c1307a432caca4f0349 /drivers/acpi | |
| parent | Merge branch 'misc-2.6.35' into release (diff) | |
| parent | ACPI: delete the "acpi=ht" boot option (diff) | |
| download | kernel-qcow2-linux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.gz kernel-qcow2-linux-d3b383338f105f50724c10a7d81b04a3930e886b.tar.xz kernel-qcow2-linux-d3b383338f105f50724c10a7d81b04a3930e886b.zip | |
Merge branch 'ht-delete-2.6.35' into release
Diffstat (limited to 'drivers/acpi')
| -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 8a0ed2800e63..f336bca7c450 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) |