From 1bd2dc4f0a29028095a9165be66ea45b61fda2d4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 21 Jun 2003 14:08:28 +0000 Subject: [PATCH] Glue the IDE code a little bit ... --- include/asm-mips/ide.h | 26 ++++---------------------- include/asm-mips64/ide.h | 26 ++++---------------------- 2 files changed, 8 insertions(+), 44 deletions(-) diff --git a/include/asm-mips/ide.h b/include/asm-mips/ide.h index 91afa8ffe3a..f377adcfb1a 100644 --- a/include/asm-mips/ide.h +++ b/include/asm-mips/ide.h @@ -64,28 +64,10 @@ static __inline__ void ide_init_default_hwifs(void) #endif } -#ifdef __BIG_ENDIAN - -/* get rid of defs from io.h - ide has its private and conflicting versions */ -#ifdef insw -#undef insw -#endif -#ifdef outsw -#undef outsw -#endif -#ifdef insl -#undef insl -#endif -#ifdef outsl -#undef outsl -#endif - -#define insw(port, addr, count) ide_insw(port, addr, count) -#define insl(port, addr, count) ide_insl(port, addr, count) -#define outsw(port, addr, count) ide_outsw(port, addr, count) -#define outsl(port, addr, count) ide_outsl(port, addr, count) - -#endif /* __BIG_ENDIAN */ +#define __ide_mm_insw ide_insw +#define __ide_mm_insl ide_insl +#define __ide_mm_outsw ide_outsw +#define __ide_mm_outsl ide_outsl #endif /* __KERNEL__ */ diff --git a/include/asm-mips64/ide.h b/include/asm-mips64/ide.h index 91afa8ffe3a..f377adcfb1a 100644 --- a/include/asm-mips64/ide.h +++ b/include/asm-mips64/ide.h @@ -64,28 +64,10 @@ static __inline__ void ide_init_default_hwifs(void) #endif } -#ifdef __BIG_ENDIAN - -/* get rid of defs from io.h - ide has its private and conflicting versions */ -#ifdef insw -#undef insw -#endif -#ifdef outsw -#undef outsw -#endif -#ifdef insl -#undef insl -#endif -#ifdef outsl -#undef outsl -#endif - -#define insw(port, addr, count) ide_insw(port, addr, count) -#define insl(port, addr, count) ide_insl(port, addr, count) -#define outsw(port, addr, count) ide_outsw(port, addr, count) -#define outsl(port, addr, count) ide_outsl(port, addr, count) - -#endif /* __BIG_ENDIAN */ +#define __ide_mm_insw ide_insw +#define __ide_mm_insl ide_insl +#define __ide_mm_outsw ide_outsw +#define __ide_mm_outsl ide_outsl #endif /* __KERNEL__ */ -- 2.11.4.GIT