diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 09:07:49 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 09:07:49 -0500 |
commit | aa9c9b8c584a42a094202b7e0f63497e888f86a7 (patch) | |
tree | 3cb3b022054a7c1722657288518f495e0c4d9983 /arch/x86/kernel/setup.c | |
parent | 87f7606591aea6a8a38ea4c8911b5eeeee2740b8 (diff) | |
parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) |
Merge branch 'linus' into x86/quirks
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 31328909456e..f5096a6bf4ed 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -777,7 +777,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
777 | .callback = dmi_low_memory_corruption, | 777 | .callback = dmi_low_memory_corruption, |
778 | .ident = "Phoenix BIOS", | 778 | .ident = "Phoenix BIOS", |
779 | .matches = { | 779 | .matches = { |
780 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), | 780 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), |
781 | }, | 781 | }, |
782 | }, | 782 | }, |
783 | #endif | 783 | #endif |