---

yaml --- r: 356451 b: refs/heads/master c: 9c2f451 h: refs/heads/master i: 356449: 2aaa201 356447: c601f99 v: v3
git-mirror · Feb 13, 2013 · 1aeb404 · 1aeb404
1 parent f8c570d
commit 1aeb404
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14f40f31e8ffd639c2e3e0cd90ec6dd8b536144b
+refs/heads/master: 9c2f451e0db90d257c745df1d967c8010f14f0dd
diff --git a/trunk/arch/powerpc/platforms/83xx/km83xx.c b/trunk/arch/powerpc/platforms/83xx/km83xx.c
@@ -148,11 +148,13 @@ static void __init mpc83xx_km_setup_arch(void)
 
 		for_each_node_by_name(np, "ucc")
 			par_io_of_config(np);
-	}
-	np = of_find_compatible_node(NULL, "network", "ucc_geth");
-	if (np != NULL) {
-		quirk_mpc8360e_qe_enet10();
-		of_node_put(np);
+
+		/* Only apply this quirk when par_io is available */
+		np = of_find_compatible_node(NULL, "network", "ucc_geth");
+		if (np != NULL) {
+			quirk_mpc8360e_qe_enet10();
+			of_node_put(np);
+		}
 	}
 #endif	/* CONFIG_QUICC_ENGINE */
 }