From: Masoud Sharbiani Date: Thu, 26 Sep 2013 17:30:43 +0000 (-0700) Subject: x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5eafc6f07c95e9f3dd047e72737449cb03c9956;p=linux-beck.git 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" Signed-off-by: Masoud Sharbiani 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 --- diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f0783a68db11..d9333a404685 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -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 = {