diff options
author | Michal Simek <monstr@monstr.eu> | 2010-01-14 15:40:11 +0100 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-02-25 17:28:37 +0100 |
commit | 9d929b368d6294b073d0ac315c7ee804cbb0e0f5 (patch) | |
tree | 2f4a03b9df760b4b02a11b34247b53cf8cfb44be /arch/microblaze/include | |
parent | dd13491855dfe08996568e6e373b52a2d6e12e9d (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')
-rw-r--r-- | arch/microblaze/include/asm/io.h | 13 |
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..5d45152d699e 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 */ |