Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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..4f68c8a 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -5,7 +5,7 @@
  */
 
 /*
- *  This file contains the i386 architecture specific IDE code.
+ *  This file contains the ARM architecture specific IDE code.
  */
 
 #ifndef __ASMARM_IDE_H
@@ -17,16 +17,14 @@
 #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)
-
-#define ide_init_default_irq(base)     (0)
+#if !defined(CONFIG_ARCH_L7200)
+# 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 */
 
 #define __ide_mm_insw(port,addr,len)   readsw(port,addr,len)
 #define __ide_mm_insl(port,addr,len)   readsl(port,addr,len)