summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/io.h
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-01-14 15:40:11 +0100
committerMichal Simek <monstr@monstr.eu>2010-03-11 14:00:09 +0100
commit2ddafeab6f159640299d17fb9b73b57f65011d85 (patch)
tree980ce95b224ad41f8bef20c9fd35b12c21c694fd /arch/microblaze/include/asm/io.h
parentc6ba01a4c7806d134c8d483525997559071d0990 (diff)
microblaze: io.h include asm-generic/iomap.h
I need to use generic/iomap.h for PCI that's why is necessary to include it and fix ioport_{map,unmap} functions. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include/asm/io.h')
-rw-r--r--arch/microblaze/include/asm/io.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 9ac409ad906b..f82df5d221a8 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -15,6 +15,7 @@
#include <asm/page.h>
#include <linux/types.h>
#include <linux/mm.h> /* Get struct page {...} */
+#include <asm-generic/iomap.h>
#define PCI_DRAM_OFFSET 0
@@ -228,15 +229,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,
#define out_8(a, v) __raw_writeb((v), (a))
#define in_8(a) __raw_readb(a)
-/* FIXME */
-static inline void __iomem *ioport_map(unsigned long port, unsigned int len)
-{
- return (void __iomem *) (port);
-}
-
-static inline void ioport_unmap(void __iomem *addr)
-{
- /* Nothing to do */
-}
+#define ioport_map(port, nr) ((void __iomem *)(port))
+#define ioport_unmap(addr)
#endif /* _ASM_MICROBLAZE_IO_H */