commit 2a8f7450f828eaee49d66f41f99ac2e54f1160a6
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Thu Jul 24 22:53:31 2008 +0200
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Thu Jul 24 22:53:31 2008 +0200
tree e8762e9add74953a32ebd86c019638e5ed2d484d
parent f01d35d87f39ab794ddcdefadb79c11054bcbfbc

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>

include/linux/ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 76fe00b..fd78b40 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -211,7 +211,13 @@
 	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)