diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /arch/x86/kernel/setup.c | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
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 af690aa593a..e6c51433247 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -613,7 +613,7 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { | |||
| 613 | .callback = dmi_low_memory_corruption, | 613 | .callback = dmi_low_memory_corruption, |
| 614 | .ident = "Phoenix BIOS", | 614 | .ident = "Phoenix BIOS", |
| 615 | .matches = { | 615 | .matches = { |
| 616 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), | 616 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies"), |
| 617 | }, | 617 | }, |
| 618 | }, | 618 | }, |
| 619 | #endif | 619 | #endif |