diff options
| author | Masoud Sharbiani <msharbiani@twitter.com> | 2013-09-26 10:30:43 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:34 +0100 |
| commit | 995bbf4a0aca3753b1ffa641cdecf7248c9cbc8d (patch) | |
| tree | 79e7fdd1bbd5abaf9103d20ada832b32bec47367 /arch/x86 | |
| parent | 2b4c13a44a4254585c20bf5a3c52d702be129079 (diff) | |
| download | kernel_samsung_smdk4412-995bbf4a0aca3753b1ffa641cdecf7248c9cbc8d.zip kernel_samsung_smdk4412-995bbf4a0aca3753b1ffa641cdecf7248c9cbc8d.tar.gz kernel_samsung_smdk4412-995bbf4a0aca3753b1ffa641cdecf7248c9cbc8d.tar.bz2 | |
x86/reboot: Remove the duplicate C6100 entry in the reboot quirks list
commit b5eafc6f07c95e9f3dd047e72737449cb03c9956 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/x86')
| -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 3e5bf1d..f22fc2f 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -456,14 +456,6 @@ static struct dmi_system_id __initdata pci_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"), }, |