Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc6ae5e4 authored by Jate Sujjavanich's avatar Jate Sujjavanich Committed by Greg Ungerer
Browse files

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: default avatarJate Sujjavanich <jsujjavanich@syntech-fuelmaster.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent da5cabf8

arch/m68k/include/asm/ide.h

+11 −2
Original line number Diff line number Diff line 
/*

 *  linux/include/asm-m68k/ide.h

 *

 *  Copyright (C) 1994-1996  Linus Torvalds & authors

 */
@@ -34,6 +32,8 @@ 
#include <asm/io.h>

#include <asm/irq.h>



#ifdef CONFIG_MMU



/*

 * Get rid of defs from io.h - ide has its private and conflicting versions

 * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we
@@ -53,5 +53,14 @@ 
#define __ide_mm_outsw(port, addr, n)	raw_outsw((u16 *)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	raw_outsl((u32 *)port, addr, n)



#else



#define __ide_mm_insw(port, addr, n)	io_insw((unsigned int)port, addr, n)

#define __ide_mm_insl(port, addr, n)	io_insl((unsigned int)port, addr, n)

#define __ide_mm_outsw(port, addr, n)	io_outsw((unsigned int)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	io_outsl((unsigned int)port, addr, n)



#endif /* CONFIG_MMU */



#endif /* __KERNEL__ */

#endif /* _M68K_IDE_H */