aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/boot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r--arch/x86/kernel/acpi/boot.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index df586bbc9447..7914ab0ad76e 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1559,8 +1559,10 @@ static int __init parse_acpi(char *arg)
1559 } 1559 }
1560 /* Limit ACPI just to boot-time to enable HT */ 1560 /* Limit ACPI just to boot-time to enable HT */
1561 else if (strcmp(arg, "ht") == 0) { 1561 else if (strcmp(arg, "ht") == 0) {
1562 if (!acpi_force) 1562 if (!acpi_force) {
1563 printk(KERN_WARNING "acpi=ht will be removed in Linux-2.6.35\n");
1563 disable_acpi(); 1564 disable_acpi();
1565 }
1564 acpi_ht = 1; 1566 acpi_ht = 1;
1565 } 1567 }
1566 /* acpi=rsdt use RSDT instead of XSDT */ 1568 /* acpi=rsdt use RSDT instead of XSDT */