diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 11:51:39 -0600 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 11:51:39 -0600 |
| commit | 877d66856e9de4a6d1ffbf61bec6f830bde4d3bf (patch) | |
| tree | 61249ed3466942867666af42c44044ff1e83fdc5 /arch/powerpc/sysdev/fsl_soc.c | |
| parent | db8ff907027b63b02c8cef385ea95445b7a41357 (diff) | |
| parent | 12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d (diff) | |
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.
>>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 4 |
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; |