aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Siewior <bigeasy@linutronix.de>2014-02-20 15:48:16 -0500
committerScott Wood <scottwood@freescale.com>2014-03-19 20:02:42 -0400
commitb0ad062cc410331e33e710bbc50d02ed587a217f (patch)
tree2c8c782c741c70f191541fd2856b2922829a07ef
parentc70a97447b34ceaee2eebcd5a78886398d91ffde (diff)
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 <bigeasy@linutronix.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_rdb.c5
1 files changed, 1 insertions, 4 deletions
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)
86 */ 86 */
87static void __init mpc85xx_rdb_setup_arch(void) 87static void __init mpc85xx_rdb_setup_arch(void)
88{ 88{
89#ifdef CONFIG_QUICC_ENGINE
90 struct device_node *np;
91#endif
92
93 if (ppc_md.progress) 89 if (ppc_md.progress)
94 ppc_md.progress("mpc85xx_rdb_setup_arch()", 0); 90 ppc_md.progress("mpc85xx_rdb_setup_arch()", 0);
95 91
@@ -101,6 +97,7 @@ static void __init mpc85xx_rdb_setup_arch(void)
101 mpc85xx_qe_init(); 97 mpc85xx_qe_init();
102#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) 98#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE)
103 if (machine_is(p1025_rdb)) { 99 if (machine_is(p1025_rdb)) {
100 struct device_node *np;
104 101
105 struct ccsr_guts __iomem *guts; 102 struct ccsr_guts __iomem *guts;
106 103