Merge branch 'ixp4xx' into devel

[sfrench/cifs-2.6.git] / include / asm-arm / arch-ixp4xx / io.h

diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h
index b27c910adf9d58a4935763ea62e9eaf247aedc1e..c72f9d79417cbc3208bdc0574bb6784685605523 100644 (file)
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
@@ -61,7 +61,7 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
 static inline void __iomem *
 __ixp4xx_ioremap(unsigned long addr, size_t size, unsigned int mtype)
 {
-       if((addr < 0x48000000) || (addr > 0x4fffffff))
+       if((addr < PCIBIOS_MIN_MEM) || (addr > 0x4fffffff))
                return __arm_ioremap(addr, size, mtype);
 
        return (void *)addr;