From: Michal Simek <monstr@monstr.eu>
Date: Thu, 14 Jan 2010 14:40:11 +0000 (+0100)
Subject: microblaze: io.h include asm-generic/iomap.h
X-Git-Tag: v2.6.34-rc2~16^2~22
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=2ddafeab6f159640299d17fb9b73b57f65011d85;p=safe%2Fjmp%2Flinux-2.6

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>
---

diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 9ac409a..f82df5d 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 */