diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2004-11-18 22:58:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-18 22:58:51 -0800 |
| commit | 37f30064593d33033d270197033b3f987a5aa884 (patch) | |
| tree | fe8b8017a9442d746dc6dc7e0b233bc624fc75e8 /include | |
| parent | 9758379b8b26a8403328bb40a3291678bf0e5d81 (diff) | |
[PATCH] M68k I/O: Move HP300 I/O macros close to other I/O macros again
M68k I/O: Move HP300 I/O macros close to other I/O macros again (after merge
error in 2.6.10-rc2)
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/io.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index 0f23907fa291..c963b138a142 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h @@ -306,6 +306,24 @@ static inline void isa_delay(void) #endif #endif /* CONFIG_PCI */ +#if !defined(CONFIG_ISA) && !defined(CONFIG_PCI) && defined(CONFIG_HP300) +/* + * We need to define dummy functions otherwise drivers/serial/8250.c doesn't link + */ +#define inb(port) 0xff +#define inb_p(port) 0xff +#define outb(val,port) do { } while (0) +#define outb_p(val,port) do { } while (0) + +/* + * These should be valid on any ioremap()ed region + */ +#define readb(addr) in_8(addr) +#define writeb(val,addr) out_8((addr),(val)) +#define readl(addr) in_le32(addr) +#define writel(val,addr) out_le32((addr),(val)) +#endif + #define mmiowb() static inline void *ioremap(unsigned long physaddr, unsigned long size) @@ -327,23 +345,6 @@ static inline void *ioremap_fullcache(unsigned long physaddr, return __ioremap(physaddr, size, IOMAP_FULL_CACHING); } -#if !defined(CONFIG_ISA) && !defined(CONFIG_PCI) && defined(CONFIG_HP300) -/* - * We need to define dummy functions otherwise drivers/serial/8250.c doesn't link - */ -#define inb(port) 0xff -#define inb_p(port) 0xff -#define outb(val,port) do { } while (0) -#define outb_p(val,port) do { } while (0) - -/* - * These should be valid on any ioremap()ed region - */ -#define readb(addr) in_8(addr) -#define writeb(val,addr) out_8((addr),(val)) -#define readl(addr) in_le32(addr) -#define writel(val,addr) out_le32((addr),(val)) -#endif /* m68k caches aren't DMA coherent */ extern void dma_cache_wback_inv(unsigned long start, unsigned long size); |