diff options
| author | Holger Freyther <zecke@org.rmk.(none)> | 2004-12-05 16:31:17 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-12-05 16:31:17 +0000 |
| commit | 92850dcc55aa9a2428bd50dc75c640f743bf9d2c (patch) | |
| tree | e3b3d5e3d4e43ce630c5611edbad9b2cf0bbcd7c /include | |
| parent | a41a8d1fd8f3f23a1305adff9111608e56a2e402 (diff) | |
[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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-sa1100/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/ide.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-arm/arch-sa1100/ide.h b/include/asm-arm/arch-sa1100/ide.h index f63b96baa6b9..2153538069c7 100644 --- a/include/asm-arm/arch-sa1100/ide.h +++ b/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. diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h index cf9b1b35f8e7..2114acb3d237 100644 --- a/include/asm-arm/ide.h +++ b/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 |