diff --git a/[refs] b/[refs] index 4dcfbd69b5d3..c12cae9b4b30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6662327e190a20bd42867f11abca095badee56e1 +refs/heads/master: 428695b89831d781ba203d97ee07da68150ea40d diff --git a/trunk/include/asm-sparc/io_32.h b/trunk/include/asm-sparc/io_32.h index c43af722ae8c..10d7da450070 100644 --- a/trunk/include/asm-sparc/io_32.h +++ b/trunk/include/asm-sparc/io_32.h @@ -244,6 +244,7 @@ _memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n) */ extern void __iomem *ioremap(unsigned long offset, unsigned long size); #define ioremap_nocache(X,Y) ioremap((X),(Y)) +#define ioremap_wc(X,Y) ioremap((X),(Y)) extern void iounmap(volatile void __iomem *addr); #define ioread8(X) readb(X) diff --git a/trunk/include/asm-sparc/io_64.h b/trunk/include/asm-sparc/io_64.h index 11daa31cdaf9..0bff078ffdd0 100644 --- a/trunk/include/asm-sparc/io_64.h +++ b/trunk/include/asm-sparc/io_64.h @@ -460,6 +460,7 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) } #define ioremap_nocache(X,Y) ioremap((X),(Y)) +#define ioremap_wc(X,Y) ioremap((X),(Y)) static inline void iounmap(volatile void __iomem *addr) {