aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorPaul Mundt <[email protected]>2009-11-18 10:53:52 +0900
committerPaul Mundt <[email protected]>2009-11-18 10:53:52 +0900
commit260af56271f79da0e37faa5a99b1786b221297e5 (patch)
treed76a2609f940b88083314d5f9131c73115bd4dcb /arch/x86/kernel/setup.c
parent1dca899e95d27475c9036ce1cf857a72852b9c53 (diff)
parent648f15345add88a7eea724365fe1217a8d8a1e16 (diff)
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e09f0e2c14b5..2a34f9c5be21 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -660,6 +660,13 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
},
},
{
+ .callback = dmi_low_memory_corruption,
+ .ident = "Phoenix/MSC BIOS",
+ .matches = {
+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix/MSC"),
+ },
+ },
+ {
/*
* AMI BIOS with low memory corruption was found on Intel DG45ID board.
* It hase different DMI_BIOS_VENDOR = "Intel Corp.", for now we will