Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 85xx / twr_p102x.c

diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c
index 9abb1e9f73c40fa8235a36f0b6cb72c559aff470..eaec099b4077172940233fa0d1de4ae75e689bba 100644 (file)
--- a/arch/powerpc/platforms/85xx/twr_p102x.c
+++ b/arch/powerpc/platforms/85xx/twr_p102x.c
@@ -45,10 +45,6 @@ static void __init twr_p1025_pic_init(void)
  */
 static void __init twr_p1025_setup_arch(void)
 {
-#ifdef CONFIG_QUICC_ENGINE
-       struct device_node *np;
-#endif
-
        if (ppc_md.progress)
                ppc_md.progress("twr_p1025_setup_arch()", 0);
 
@@ -62,6 +58,7 @@ static void __init twr_p1025_setup_arch(void)
 #if IS_ENABLED(CONFIG_UCC_GETH) || IS_ENABLED(CONFIG_SERIAL_QE)
        if (machine_is(twr_p1025)) {
                struct ccsr_guts __iomem *guts;
+               struct device_node *np;
 
                np = of_find_compatible_node(NULL, NULL, "fsl,p1021-guts");
                if (np) {