Commit 331cc23e authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.6

into intel.com:/home/lenb/src/linux-acpi-test-2.6.7
parents fe0eff83 98b20278
...@@ -547,14 +547,20 @@ static __init int ignore_timer_override(struct dmi_blacklist *d) ...@@ -547,14 +547,20 @@ static __init int ignore_timer_override(struct dmi_blacklist *d)
#ifdef CONFIG_ACPI_PCI #ifdef CONFIG_ACPI_PCI
static __init int disable_acpi_irq(struct dmi_blacklist *d) static __init int disable_acpi_irq(struct dmi_blacklist *d)
{ {
printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n", d->ident); if (!acpi_force) {
printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n",
d->ident);
acpi_noirq_set(); acpi_noirq_set();
}
return 0; return 0;
} }
static __init int disable_acpi_pci(struct dmi_blacklist *d) static __init int disable_acpi_pci(struct dmi_blacklist *d)
{ {
printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n", d->ident); if (!acpi_force) {
printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n",
d->ident);
acpi_disable_pci(); acpi_disable_pci();
}
return 0; return 0;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment