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_ifc.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_ifc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_ifc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_ifc.c b/arch/powerpc/sysdev/fsl_ifc.c index 2a36fd6a958..d7fc7223914 100644 --- a/arch/powerpc/sysdev/fsl_ifc.c +++ b/arch/powerpc/sysdev/fsl_ifc.c @@ -63,7 +63,7 @@ int fsl_ifc_find(phys_addr_t addr_base) return -ENODEV; for (i = 0; i < ARRAY_SIZE(fsl_ifc_ctrl_dev->regs->cspr_cs); i++) { - __be32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr); + u32 cspr = in_be32(&fsl_ifc_ctrl_dev->regs->cspr_cs[i].cspr); if (cspr & CSPR_V && (cspr & CSPR_BA) == convert_ifc_address(addr_base)) return i; |