---

yaml --- r: 185167 b: refs/heads/master c: 0a83232 h: refs/heads/master i: 185165: ef85918 185163: e0c4486 185159: 4145c3f 185151: 4d178c6 v: v3
git-mirror · Feb 17, 2010 · d4ce891 · d4ce891
1 parent 59dbb33
commit d4ce891
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: 18dce6ba5c8c6bd0f3ab4efa4cbdd698dab5c40a
+refs/heads/master: 0a832320f1bae6a4169bf683e201378f2437cfc1
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
@@ -461,6 +461,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"),
 		},
 	},
+	{	/* Handle problems with rebooting on the iMac9,1. */
+		.callback = set_pci_reboot,
+		.ident = "Apple iMac9,1",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
+		},
+	},
 	{ }
 };