diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-28 09:43:54 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 12:38:11 +0000 |
commit | 635f0258e5ae526034486b4ae9020e64bfb7d27e (patch) | |
tree | 636a311dde9092b8d8f48f5969a70cfa9dba099f /drivers/ide | |
parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
download | kernel-crypto-635f0258e5ae526034486b4ae9020e64bfb7d27e.tar.gz kernel-crypto-635f0258e5ae526034486b4ae9020e64bfb7d27e.tar.xz kernel-crypto-635f0258e5ae526034486b4ae9020e64bfb7d27e.zip |
[ARM] clps7500: remove support
The CLPS7500 platform has not built since 2.6.22-git7 and there
seems to be no interest in fixing it. So, remove the platform
support.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/Kconfig | 2 | ||||
-rw-r--r-- | drivers/ide/ide_arm.c | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 6d7401772a8..57630402ea6 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -732,7 +732,7 @@ config BLK_DEV_IDE_TX4939 config IDE_ARM tristate "ARM IDE support" - depends on ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) + depends on ARM && (ARCH_RPC || ARCH_SHARK) default y config BLK_DEV_IDE_ICSIDE diff --git a/drivers/ide/ide_arm.c b/drivers/ide/ide_arm.c index f728f2927b5..bdcac94d7c1 100644 --- a/drivers/ide/ide_arm.c +++ b/drivers/ide/ide_arm.c @@ -15,15 +15,8 @@ #define DRV_NAME "ide_arm" -#ifdef CONFIG_ARCH_CLPS7500 -# include <mach/hardware.h> -# -# define IDE_ARM_IO (ISASLOT_IO + 0x1f0) -# define IDE_ARM_IRQ IRQ_ISA_14 -#else -# define IDE_ARM_IO 0x1f0 -# define IDE_ARM_IRQ IRQ_HARDDISK -#endif +#define IDE_ARM_IO 0x1f0 +#define IDE_ARM_IRQ IRQ_HARDDISK static int __init ide_arm_init(void) { |