Commit b5eafc6f authored Sep 26, 2013 by Masoud Sharbiani Committed by Ingo Molnar Sep 26, 2013

x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list



Two entries for the same system type were added, with two different vendor
names: 'Dell' and 'Dell, Inc.'.

Since a prefix match is being used by the DMI parsing code, we can eliminate
the latter as redundant.

Reported-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Masoud Sharbiani <msharbiani@twitter.com>
Cc: holt@sgi.com
Link: http://lkml.kernel.org/r/1380216643-4683-1-git-send-email-masoud.sharbiani@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 474a83b7

arch/x86/kernel/reboot.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -359,14 +359,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
		},
		},
		{ /* Handle problems with rebooting on the Dell PowerEdge C6100. */
		.callback = set_pci_reboot,
		.ident = "Dell PowerEdge C6100",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
		},
		},
		{ /* Some C6100 machines were shipped with vendor being 'Dell'. */
		.callback = set_pci_reboot,
		.ident = "Dell PowerEdge C6100",
		.matches = {

Admin message