diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-06 15:58:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-06 15:58:29 -0400 |
| commit | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch) | |
| tree | ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /include/asm-arm/arch-ixp4xx/io.h | |
| parent | 6f95416ebe81b3ad63884538555efb81cb05749f (diff) | |
| parent | 28bd3a0dcce11bea6f99a351cc64053dff00196e (diff) | |
Merge branch 'ixp4xx' into devel
Conflicts:
include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/io.h')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h index b27c910adf9..c72f9d79417 100644 --- 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); | |||
| 61 | static inline void __iomem * | 61 | static inline void __iomem * |
| 62 | __ixp4xx_ioremap(unsigned long addr, size_t size, unsigned int mtype) | 62 | __ixp4xx_ioremap(unsigned long addr, size_t size, unsigned int mtype) |
| 63 | { | 63 | { |
| 64 | if((addr < 0x48000000) || (addr > 0x4fffffff)) | 64 | if((addr < PCIBIOS_MIN_MEM) || (addr > 0x4fffffff)) |
| 65 | return __arm_ioremap(addr, size, mtype); | 65 | return __arm_ioremap(addr, size, mtype); |
| 66 | 66 | ||
| 67 | return (void *)addr; | 67 | return (void *)addr; |