From 6eedc681410531e5c1867223605323eb47098455 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 16 Nov 2011 00:19:51 +0100
Subject: [PATCH] --- yaml --- r: 276398 b: refs/heads/master c:
 6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 18597a6c2847..9e1cfd788978 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b495e039b4ce2ce4a96b3006004faf082f4d50e2
+refs/heads/master: 6be30bb7d7504ec687a65c9bbdae8d1d2f8eaa19
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index e334be1182b9..4463d2fee4e3 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/arch/x86/kernel/reboot.c
@@ -443,6 +443,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
 		},
 	},
+	{	/* Handle problems with rebooting on the OptiPlex 990. */
+		.callback = set_pci_reboot,
+		.ident = "Dell OptiPlex 990",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
+		},
+	},
 	{ }
 };