diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
| commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
| tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /arch/x86/kernel/setup.c | |
| parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
| parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) | |
Merge branch 'x86/urgent' into x86/iommu
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 67d5979e654e..decb492134c3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -765,7 +765,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
| 765 | .callback = dmi_low_memory_corruption, | 765 | .callback = dmi_low_memory_corruption, |
| 766 | .ident = "Phoenix BIOS", | 766 | .ident = "Phoenix BIOS", |
| 767 | .matches = { | 767 | .matches = { |
| 768 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), | 768 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), |
| 769 | }, | 769 | }, |
| 770 | }, | 770 | }, |
| 771 | #endif | 771 | #endif |