---

yaml --- r: 311519 b: refs/heads/master c: 76eb9a3 h: refs/heads/master i: 311517: 2d9356f 311515: 7d650ba 311511: bb61c38 311503: 035e1b3 311487: e315e1e v: v3
git-mirror · Jun 5, 2012 · ac7a7eb · ac7a7eb
1 parent 43b85a4
commit ac7a7eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f132652d94c96476b0b0a8caf0c10e96ab10fa8
+refs/heads/master: 76eb9a30db4bc8fd172f9155247264b5f2686d7b
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
@@ -451,6 +451,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
 		},
 	},
+	{	/* Handle problems with rebooting on the Precision M6600. */
+		.callback = set_pci_reboot,
+		.ident = "Dell OptiPlex 990",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
+		},
+	},
 	{ }
 };