diff --git a/[refs] b/[refs] index 4721e5126ef9..ffcf0063b6b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb52d5801302a3515506891c13338fbaa7222f36 +refs/heads/master: 62439a2954b9027c9ec481e1d39cd5d63f7c1b17 diff --git a/trunk/arch/unicore32/include/asm/io.h b/trunk/arch/unicore32/include/asm/io.h index 1a5c5a5eb39c..a75ad0b117cc 100644 --- a/trunk/arch/unicore32/include/asm/io.h +++ b/trunk/arch/unicore32/include/asm/io.h @@ -39,13 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr); #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) #define iounmap(cookie) __uc32_iounmap(cookie) -/* - * Convert a physical pointer to a virtual kernel pointer for /dev/mem - * access - */ -#undef xlate_dev_mem_ptr -#define xlate_dev_mem_ptr(p) __va(p) - #define HAVE_ARCH_PIO_SIZE #define PIO_OFFSET (unsigned int)(PCI_IOBASE) #define PIO_MASK (unsigned int)(IO_SPACE_LIMIT)