Merge remote-tracking branch 'kumar/next' into next

<<
Mostly misc code cleanups in various board ports and adding support for a
new MPC85xx board - ppa8548.
>>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 97118dc3d285..228cf91b91c1 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -58,10 +58,10 @@ phys_addr_t get_immrbase(void)
         if (soc) {
                 int size;
                 u32 naddr;
-                const u32 *prop = of_get_property(soc, "#address-cells", &size);
+                const __be32 *prop = of_get_property(soc, "#address-cells", &size);
 
                 if (prop && size == 4)
-                        naddr = *prop;
+                        naddr = be32_to_cpup(prop);
                 else
                         naddr = 2;