summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc85xx/portals.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-07-31 12:55:39 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-09-29 19:01:04 -0500
commite2d0f255cf730ba56c6531a1bdadd347800d9cca (patch)
tree507f04c3e830de93f94d21abc500e288696ba17f /arch/powerpc/cpu/mpc85xx/portals.c
parentbc6bbd6be85973359e89f53e3bfbba2a3549da09 (diff)
downloadu-boot-imx-e2d0f255cf730ba56c6531a1bdadd347800d9cca.zip
u-boot-imx-e2d0f255cf730ba56c6531a1bdadd347800d9cca.tar.gz
u-boot-imx-e2d0f255cf730ba56c6531a1bdadd347800d9cca.tar.bz2
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 <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/portals.c')
-rw-r--r--arch/powerpc/cpu/mpc85xx/portals.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index ecaa30d..65635e7 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)