diff options
author | Masoud Sharbiani <msharbiani@twitter.com> | 2013-09-26 13:30:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-09-26 14:52:37 -0400 |
commit | b5eafc6f07c95e9f3dd047e72737449cb03c9956 (patch) | |
tree | 217a57a246469aace2e2865058dd478e689c603a | |
parent | 474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (diff) |
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>
-rw-r--r-- | arch/x86/kernel/reboot.c | 8 |
1 files changed, 0 insertions, 8 deletions
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 | |||
@@ -362,14 +362,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
362 | .callback = set_pci_reboot, | 362 | .callback = set_pci_reboot, |
363 | .ident = "Dell PowerEdge C6100", | 363 | .ident = "Dell PowerEdge C6100", |
364 | .matches = { | 364 | .matches = { |
365 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
366 | DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), | ||
367 | }, | ||
368 | }, | ||
369 | { /* Some C6100 machines were shipped with vendor being 'Dell'. */ | ||
370 | .callback = set_pci_reboot, | ||
371 | .ident = "Dell PowerEdge C6100", | ||
372 | .matches = { | ||
373 | DMI_MATCH(DMI_SYS_VENDOR, "Dell"), | 365 | DMI_MATCH(DMI_SYS_VENDOR, "Dell"), |
374 | DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), | 366 | DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), |
375 | }, | 367 | }, |