diff --git a/[refs] b/[refs] index 36e727370d21..787d46e15558 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2216d199b1430d1c0affb1498a9ebdbd9c0de439 +refs/heads/master: a8b71a2810386a5ac8f43d2095fe3355f0d8db37 diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index d29951c11be0..3ce3edfcc3cd 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -758,8 +758,8 @@ static struct dmi_system_id __initdata bad_bios_dmi_table[] = { DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), }, }, - {} #endif + {} }; /*