Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 97118dc3d2851b7a33ce46a4aec162ff1cc4bba5..228cf91b91c14bc4e865e89371595363aa7858cc 100644 (file)
--- 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;