Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68knommu: arch/m68k/include/asm/ide.h fix for nommu

The arch/m68k/include/asm/ide.h produces errors when the IDE driver is compiled for my 523x uClinux system under kernel. The header makes some redefines of operators not defined in the arch/m68k/include/asm/io_no.h header. There are no separate mmio and iospace defines.

Signed-off-by: Jate Sujjavanich <jsujjavanich@syntech-fuelmaster.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>

authored by

Jate Sujjavanich and committed by
Greg Ungerer
dc6ae5e4 da5cabf8

+11 -2
+11 -2
arch/m68k/include/asm/ide.h
··· 1 1 /* 2 - * linux/include/asm-m68k/ide.h 3 - * 4 2 * Copyright (C) 1994-1996 Linus Torvalds & authors 5 3 */ 6 4 ··· 32 34 #include <asm/io.h> 33 35 #include <asm/irq.h> 34 36 37 + #ifdef CONFIG_MMU 38 + 35 39 /* 36 40 * Get rid of defs from io.h - ide has its private and conflicting versions 37 41 * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we ··· 52 52 #define writew(val, port) out_be16(port, val) 53 53 #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) 54 54 #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) 55 + 56 + #else 57 + 58 + #define __ide_mm_insw(port, addr, n) io_insw((unsigned int)port, addr, n) 59 + #define __ide_mm_insl(port, addr, n) io_insl((unsigned int)port, addr, n) 60 + #define __ide_mm_outsw(port, addr, n) io_outsw((unsigned int)port, addr, n) 61 + #define __ide_mm_outsl(port, addr, n) io_outsl((unsigned int)port, addr, n) 62 + 63 + #endif /* CONFIG_MMU */ 55 64 56 65 #endif /* __KERNEL__ */ 57 66 #endif /* _M68K_IDE_H */