From: Sebastian Siewior Date: Thu, 20 Feb 2014 20:48:16 +0000 (+0100) Subject: powerpc: 85xx rdb: move np pointer to avoid builderror X-Git-Tag: v3.15-rc1~124^2^2~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0ad062cc410331e33e710bbc50d02ed587a217f;p=karo-tx-linux.git powerpc: 85xx rdb: move np pointer to avoid builderror If CONFIG_UCC_GETH or CONFIG_SERIAL_QE is not defined then we get a warning about an used variable which leads to a build error. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Scott Wood --- diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index e15bdd18fdb2..232a6a79791b 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -86,10 +86,6 @@ void __init mpc85xx_rdb_pic_init(void) */ static void __init mpc85xx_rdb_setup_arch(void) { -#ifdef CONFIG_QUICC_ENGINE - struct device_node *np; -#endif - if (ppc_md.progress) ppc_md.progress("mpc85xx_rdb_setup_arch()", 0); @@ -101,6 +97,7 @@ static void __init mpc85xx_rdb_setup_arch(void) mpc85xx_qe_init(); #if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) if (machine_is(p1025_rdb)) { + struct device_node *np; struct ccsr_guts __iomem *guts;