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>2012-11-14 18:19:19 -0700
commitd7122f811299dda2b1eee2a1601ac436a210172a (patch)
tree09292e31d8e3c6ba3d23a92681b7ba484d31c73c /arch
parent1f4bc25e4c1f7e0fa5e14474ac4d07500fcafd09 (diff)
UBUNTU: SAUCE: (no-up) 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 dd0d8a8b731..669ab6f330d 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -455,6 +455,14 @@ static struct dmi_system_id __initdata 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"),
+ },
+ },
{ }
};