From 1aeb40446d1faa3a237241eab7f10000c183390f Mon Sep 17 00:00:00 2001 From: Gerlando Falauto Date: Fri, 7 Dec 2012 16:09:15 +0100 Subject: [PATCH] --- yaml --- r: 356451 b: refs/heads/master c: 9c2f451e0db90d257c745df1d967c8010f14f0dd h: refs/heads/master i: 356449: 2aaa2018cea44b1d8a32f4c2a7b47cf0c51bb173 356447: c601f9944775005389e2e5ca701b8fe7879a99ac v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/83xx/km83xx.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 77dde7a6f547..3550d9d8811b 100644 --- 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 index 88b1af04661b..bf4c4473abb9 100644 --- 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 */ }