aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-09-09 13:23:51 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:49:11 -0700
commit8cca08941f408ec627fc0e1007bd50365147c5f6 (patch)
treeb3257f249f519af958813c1f719bc1bbd744542a /arch
parente13c25cbaea213cd4b8db58b38830e5b43ce390c (diff)
UBUNTU: SAUCE: x86: reboot: Make Dell Optiplex 790 use reboot=pci
BugLink: http://bugs.launchpad.net/bugs/818933 The Dell Optiplex 790 doesn't reboot unless reboot=pci is set. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/reboot.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 6ac6e123403..3906b56aa4e 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -451,6 +451,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6520"),
},
},
+ { /* Handle problems with rebooting on the OptiPlex 790. */
+ .callback = set_pci_reboot,
+ .ident = "Dell OptiPlex 790",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 790"),
+ },
+ },
{ }
};