diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:52:07 -0400 |
| commit | 8a3f257c704e02aee9869decd069a806b45be3f1 (patch) | |
| tree | adb9d3766c57119381304c3b94334997cc7a74a7 /arch/x86/kernel/acpi/boot.c | |
| parent | 33526a53600ac887d100e3c9b4be3637ac8ae3a5 (diff) | |
| parent | 15065531c1c5902775ae3ade24eb37d0e688353b (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 565e70c7ca93..4f942096291d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -1548,7 +1548,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) | |||
| 1548 | 1548 | ||
| 1549 | /* | 1549 | /* |
| 1550 | * If your system is blacklisted here, but you find that acpi=force | 1550 | * If your system is blacklisted here, but you find that acpi=force |
| 1551 | * works for you, please contact acpi-devel@sourceforge.net | 1551 | * works for you, please contact linux-acpi@vger.kernel.org |
| 1552 | */ | 1552 | */ |
| 1553 | static struct dmi_system_id __initdata acpi_dmi_table[] = { | 1553 | static struct dmi_system_id __initdata acpi_dmi_table[] = { |
| 1554 | /* | 1554 | /* |