patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-arm / ide.h

diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index c57af4d..b2b9b3d 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -17,16 +17,18 @@
 #define MAX_HWIFS      4
 #endif
 
-#include <asm/arch/ide.h>
-
-/*
- * We always use the new IDE port registering,
- * so these are fixed here.
- */
-#define ide_default_io_base(i)         (0)
-#define ide_default_irq(b)             (0)
+#if defined(CONFIG_ARCH_LH7A40X) || defined(CONFIG_ARCH_SA1100)
+# include <asm/arch/ide.h>     /* obsolete + broken */
+#endif
 
-#define ide_init_default_irq(base)     (0)
+#if !defined(CONFIG_ARCH_L7200) && !defined(CONFIG_ARCH_LH7A40X)
+# define IDE_ARCH_OBSOLETE_INIT
+# ifdef CONFIG_ARCH_CLPS7500
+#  define ide_default_io_ctl(base)     ((base) + 0x206) /* obsolete */
+# else
+#  define ide_default_io_ctl(base)     (0)
+# endif
+#endif /* !ARCH_L7200 && !ARCH_LH7A40X */
 
 #define __ide_mm_insw(port,addr,len)   readsw(port,addr,len)
 #define __ide_mm_insl(port,addr,len)   readsl(port,addr,len)