From e2d0f255cf730ba56c6531a1bdadd347800d9cca Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Sun, 31 Jul 2011 12:55:39 -0500 Subject: powerpc/85xx: Fix compile warnings/errors if CONFIG_SYS_DPAA_FMAN isn't set Add ifdef protection around fman specific code related to device tree clock setup. If we dont have CONFIG_SYS_DPAA_FMAN defined we shouldn't be executing this code. Signed-off-by: Kumar Gala --- arch/powerpc/cpu/mpc85xx/portals.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/powerpc/cpu/mpc85xx/portals.c') diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index ecaa30de8..65635e770 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -198,7 +198,10 @@ void fdt_fixup_qportals(void *blob) u32 liodns[2]; #endif const int *ci = fdt_getprop(blob, off, "cell-index", NULL); - int j, i = *ci; + int i = *ci; +#ifdef CONFIG_SYS_DPAA_FMAN + int j; +#endif err = fdt_setprop(blob, off, "compatible", compat, compat_len); if (err < 0) -- cgit v1.2.3-70-g09d2