Merge tag 'iio-fixes-for-3.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

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

diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 300be2d06a26f09bc642c8cad0ef5d84422cdfac..6bc5a546d49fad87ccde51786371a8d5ca9dbf63 100644 (file)
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -74,8 +74,8 @@ int fsl_lbc_find(phys_addr_t addr_base)
 
        lbc = fsl_lbc_ctrl_dev->regs;
        for (i = 0; i < ARRAY_SIZE(lbc->bank); i++) {
-               __be32 br = in_be32(&lbc->bank[i].br);
-               __be32 or = in_be32(&lbc->bank[i].or);
+               u32 br = in_be32(&lbc->bank[i].br);
+               u32 or = in_be32(&lbc->bank[i].or);
 
                if (br & BR_V && (br & or & BR_BA) == fsl_lbc_addr(addr_base))
                        return i;
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(fsl_lbc_find);
 int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)
 {
        int bank;
-       __be32 br;
+       u32 br;
        struct fsl_lbc_regs __iomem *lbc;
 
        bank = fsl_lbc_find(addr_base);