Messages in this thread Patch in this message | | | Date | Thu, 26 Sep 2013 11:58:38 -0700 | From | tip-bot for Masoud Sharbiani <> | Subject | [tip:x86/reboot] x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list |
| |
Commit-ID: b5eafc6f07c95e9f3dd047e72737449cb03c9956 Gitweb: http://git.kernel.org/tip/b5eafc6f07c95e9f3dd047e72737449cb03c9956 Author: Masoud Sharbiani <msharbiani@twitter.com> AuthorDate: Thu, 26 Sep 2013 10:30:43 -0700 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Thu, 26 Sep 2013 20:52:37 +0200
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> --- arch/x86/kernel/reboot.c | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f0783a6..d9333a4 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[] = { .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 = { DMI_MATCH(DMI_SYS_VENDOR, "Dell"), DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), },
| |