diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-06 15:27:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-06 15:27:01 -0800 |
| commit | c7141bbae476f9b2b6cd03a8e6ac152ad42bc885 (patch) | |
| tree | a4e69d112a5ccbdf75a47273b51546d24894122a /include | |
| parent | 5a530b5a070ae4f682f51b54848276b6ba715bee (diff) | |
| parent | d97fac8ff060e44c806a8f550f3a198845f5c010 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 |