powerpc: make __ffs return unsigned long

[karo-tx-linux.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 65d2ed4549e667ec981f272d88ff12fc234e9fd9..d8484d7cffaa9fd43cd170f06f6735354f4d1078 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -152,7 +152,7 @@ static int setup_one_atmu(struct ccsr_pci __iomem *pci,
                flags |= 0x10000000; /* enable relaxed ordering */
 
        for (i = 0; size > 0; i++) {
-               unsigned int bits = min(ilog2(size),
+               unsigned int bits = min_t(u32, ilog2(size),
                                        __ffs(pci_addr | phys_addr));
 
                if (index + i >= 5)