diff options
| author | Guan Xuetao <gxt@mprc.pku.edu.cn> | 2011-08-18 03:43:10 -0400 |
|---|---|---|
| committer | Guan Xuetao <gxt@mprc.pku.edu.cn> | 2012-01-09 21:29:41 -0500 |
| commit | 62439a2954b9027c9ec481e1d39cd5d63f7c1b17 (patch) | |
| tree | 29e69fb97564e68b3aeb0c488430a50cc9c621a5 /arch/unicore32/include | |
| parent | eb52d5801302a3515506891c13338fbaa7222f36 (diff) | |
unicore32: delete specified xlate_dev_mem_ptr
For the commit <f1ecc69838a2d7c8a3e1909f637d4083c071777d> has changed
xlate_dev_mem_ptr definition in asm-generic/io.h for the systems with
an MMU, so delete it from unicore32 specified io.h.
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jonas Bonn <jonas@southpole.se>
Diffstat (limited to 'arch/unicore32/include')
| -rw-r--r-- | arch/unicore32/include/asm/io.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h index 1a5c5a5eb39c..a75ad0b117cc 100644 --- a/arch/unicore32/include/asm/io.h +++ b/arch/unicore32/include/asm/io.h | |||
| @@ -39,13 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr); | |||
| 39 | #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) | 39 | #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) |
| 40 | #define iounmap(cookie) __uc32_iounmap(cookie) | 40 | #define iounmap(cookie) __uc32_iounmap(cookie) |
| 41 | 41 | ||
| 42 | /* | ||
| 43 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | ||
| 44 | * access | ||
| 45 | */ | ||
| 46 | #undef xlate_dev_mem_ptr | ||
| 47 | #define xlate_dev_mem_ptr(p) __va(p) | ||
| 48 | |||
| 49 | #define HAVE_ARCH_PIO_SIZE | 42 | #define HAVE_ARCH_PIO_SIZE |
| 50 | #define PIO_OFFSET (unsigned int)(PCI_IOBASE) | 43 | #define PIO_OFFSET (unsigned int)(PCI_IOBASE) |
| 51 | #define PIO_MASK (unsigned int)(IO_SPACE_LIMIT) | 44 | #define PIO_MASK (unsigned int)(IO_SPACE_LIMIT) |