---

yaml --- r: 105738 b: refs/heads/master c: 2a8f745 h: refs/heads/master v: v3
git-mirror · Jul 24, 2008 · dc7d718 · dc7d718
1 parent 4c27a85
commit dc7d718
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 172 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f01d35d87f39ab794ddcdefadb79c11054bcbfbc
+refs/heads/master: 2a8f7450f828eaee49d66f41f99ac2e54f1160a6
diff --git a/trunk/include/asm-alpha/ide.h b/trunk/include/asm-alpha/ide.h
diff --git a/trunk/include/asm-blackfin/ide.h b/trunk/include/asm-blackfin/ide.h
diff --git a/trunk/include/asm-h8300/ide.h b/trunk/include/asm-h8300/ide.h
diff --git a/trunk/include/asm-ia64/ide.h b/trunk/include/asm-ia64/ide.h
diff --git a/trunk/include/asm-m32r/ide.h b/trunk/include/asm-m32r/ide.h
diff --git a/trunk/include/asm-sh/ide.h b/trunk/include/asm-sh/ide.h
diff --git a/trunk/include/asm-x86/ide.h b/trunk/include/asm-x86/ide.h
diff --git a/trunk/include/asm-xtensa/ide.h b/trunk/include/asm-xtensa/ide.h
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
@@ -211,7 +211,13 @@ static inline int __ide_default_irq(unsigned long base)
 	return 0;
 }
 
+#if defined(CONFIG_ARM) || defined(CONFIG_FRV) || defined(CONFIG_M68K) || \
+    defined(CONFIG_MIPS) || defined(CONFIG_MN10300) || defined(CONFIG_PARISC) \
+    || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
 #include <asm/ide.h>
+#else
+#include <asm-generic/ide_iops.h>
+#endif
 
 #ifndef MAX_HWIFS
 #if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA)