---

yaml --- r: 63024 b: refs/heads/master c: f5d834f h: refs/heads/master v: v3
git-mirror · Jul 26, 2007 · 15a66cf · 15a66cf
1 parent 3eee81a
commit 15a66cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16782a604c458e1edcefca52457a82395b788bed
+refs/heads/master: f5d834fc34e61f1a40435981062000e5d2b2baa8
diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c
@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port)
 			break;
 		}
 		np = of_find_node_by_type(NULL, "8042");
+		/* Pegasos has no device_type on its 8042 node, look for the
+		 * name instead */
+		if (!np)
+			np = of_find_node_by_name(NULL, "8042");
 		break;
 	case FDC_BASE: /* FDC1 */
 		np = of_find_node_by_type(NULL, "fdc");