ide: remove <asm/ide.h> for some archs

* Remove <linux/irq.h> include from <asm-ia64.h> (<linux/ide.h> includes <linux/interrupt.h> which is enough). * Remove <asm/ide.h> for alpha/blackfin/h8300/ia64/m32r/sh/x86/xtensa (this leaves us with arm/frv/m68k/mips/mn10300/parisc/powerpc/sparc[64]). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
git-mirror · Jul 24, 2008 · 2a8f745 · 2a8f745
1 parent f01d35d
commit 2a8f745
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 171 deletions.
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
diff --git a/include/asm-blackfin/ide.h b/include/asm-blackfin/ide.h
diff --git a/include/asm-h8300/ide.h b/include/asm-h8300/ide.h
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
diff --git a/include/asm-xtensa/ide.h b/include/asm-xtensa/ide.h
diff --git a/include/linux/ide.h b/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)