To: linus, akpm Cc: lkml Subject: [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 --- io.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) --- linux-2.6.10-rc2/include/asm-m68k/io.h 2004-11-15 10:56:16.000000000 +0100 +++ linux-m68k-2.6.10-rc2/include/asm-m68k/io.h 2004-11-15 12:26:10.000000000 +0100 @@ -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(un 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);