summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-23 00:35:33 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-11-13 09:55:55 -0800
commitc27c4b666ddf7a36b6f20c9b809217157496b36b (patch)
treec4e0cd654ec8190e65ae969402d604c0e95e3d2e /arch
parent5c371b31be32033b0a4a993431484da8a2305369 (diff)
x86: fix macro with bad_bios_dmi_table
commit a8b71a2810386a5ac8f43d2095fe3355f0d8db37 upstream. DMI tables need a blank NULL tail. fixes the crash on Ingo's test box. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f2dd7e504881..64b5c42733f8 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -607,8 +607,8 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
},
},
- {}
#endif
+ {}
};
/*