diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-05 21:25:56 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-05 21:25:56 +0200 |
| commit | 13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch) | |
| tree | 6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /arch/x86/kernel | |
| parent | x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message (diff) | |
| parent | Linux 3.0 (diff) | |
| download | linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.xz linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.zip | |
Merge commit 'v3.0' into x86/cpu
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 4f0d46fefa7f..9242436e9937 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -419,6 +419,30 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"), }, }, + { /* Handle problems with rebooting on the Latitude E6320. */ + .callback = set_pci_reboot, + .ident = "Dell Latitude E6320", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), + }, + }, + { /* Handle problems with rebooting on the Latitude E5420. */ + .callback = set_pci_reboot, + .ident = "Dell Latitude E5420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"), + }, + }, + { /* Handle problems with rebooting on the Latitude E6420. */ + .callback = set_pci_reboot, + .ident = "Dell Latitude E6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), + }, + }, { } }; |