[ARM PATCH] 2294/1: SA1100 ide.h change superseed 2282/1

Patch from Holger Hans Peter Freyther

As proposed in 2282 asm-arm/arch-sa1100/ide.h is not included anymore from asm-arm/ide.h. 
If arch-sa1100/ide.h is included we abort with #error.
If lart.c is compiled we kindly warn that ide needs fixing for this board.


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

arch/arm/mach-sa1100/lart.c

@@ -17,6 +17,8 @@
 #include "generic.h"
 
 
+#warning "include/asm/arch-sa1100/ide.h needs fixing for lart"
+
 static struct map_desc lart_io_desc[] __initdata = {
  /* virtual     physical    length      type */
   { 0xe8000000, 0x00000000, 0x00400000, MT_DEVICE }, /* main flash memory */

include/asm-arm/arch-sa1100/ide.h

@@ -14,6 +14,8 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 
+#error "This code is broken and needs update to match with current ide support"
+
 
 /*
  * Set up a hw structure for a specified data port, control port and IRQ.

include/asm-arm/ide.h

@@ -17,10 +17,6 @@
 #define MAX_HWIFS	4
 #endif
 
-#if defined(CONFIG_ARCH_SA1100)
-# include <asm/arch/ide.h>	/* obsolete + broken */
-#endif
-
 #if !defined(CONFIG_ARCH_L7200)
 # define IDE_ARCH_OBSOLETE_INIT
 # ifdef CONFIG_ARCH_CLPS7500