diff --git a/[refs] b/[refs] index d339c46a6571..2b6145cce892 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 000e99c3334cdddaec020d7324fe4ca2a683d3dd +refs/heads/master: 6eef84a5496c678ab27b72bec0fc785c9cee063b diff --git a/trunk/include/asm-arm/arch-orion5x/io.h b/trunk/include/asm-arm/arch-orion5x/io.h index 50f8c8802206..d9a4b2065e53 100644 --- a/trunk/include/asm-arm/arch-orion5x/io.h +++ b/trunk/include/asm-arm/arch-orion5x/io.h @@ -14,7 +14,6 @@ #include "orion5x.h" #define IO_SPACE_LIMIT 0xffffffff -#define IO_SPACE_REMAP ORION5X_PCI_SYS_IO_BASE static inline void __iomem * __arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)