mpc8260/speed.c: Fix GCC 4.6 build warnings

Fix:
speed.c: In function 'get_clocks':
speed.c:113:30: warning: variable 'cpmdf' set but not used
[-Wunused-but-set-variable]
speed.c:113:23: warning: variable 'busdf' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/arch/powerpc/cpu/mpc8260/speed.c b/arch/powerpc/cpu/mpc8260/speed.c
index 0e1c2b0659773ac373fa73d7fb43298e727e80ab..bb50dee9602de8bfb535df38c68cdf1b3d7d76c6 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/speed.c
+++ b/arch/powerpc/cpu/mpc8260/speed.c
@@ -110,7 +110,7 @@ int get_clocks (void)
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        ulong clkin;
        ulong sccr, dfbrg;
-       ulong scmr, corecnf, busdf, cpmdf, plldf, pllmf;
+       ulong scmr, corecnf, plldf, pllmf;
        corecnf_t *cp;
 
 #if !defined(CONFIG_8260_CLKIN)
@@ -130,9 +130,6 @@ int get_clocks (void)
        corecnf = (scmr & SCMR_CORECNF_MSK) >> SCMR_CORECNF_SHIFT;
        cp = &corecnf_tab[corecnf];
 
-       busdf = (scmr & SCMR_BUSDF_MSK) >> SCMR_BUSDF_SHIFT;
-       cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT;
-
        /* HiP7, HiP7 Rev01, HiP7 RevA */
        if ((get_pvr () == PVR_8260_HIP7) ||
            (get_pvr () == PVR_8260_HIP7R1) ||
@@ -144,12 +141,6 @@ int get_clocks (void)
                plldf = (scmr & SCMR_PLLDF) ? 1 : 0;
                gd->vco_out = (clkin * 2 * (pllmf + 1)) / (plldf + 1);
        }
-#if 0
-       if (gd->vco_out / (busdf + 1) != clkin) {
-               /* aaarrrggghhh!!! */
-               return (1);
-       }
-#endif
 
        gd->cpm_clk = gd->vco_out / 2;
        gd->bus_clk = clkin;