diff options
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 7a0a84b042c9..c9f21e3d4ead 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -727,7 +727,7 @@ config BLK_DEV_IDE_TX4939 | |||
727 | 727 | ||
728 | config IDE_ARM | 728 | config IDE_ARM |
729 | tristate "ARM IDE support" | 729 | tristate "ARM IDE support" |
730 | depends on ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) | 730 | depends on ARM && (ARCH_RPC || ARCH_SHARK) |
731 | default y | 731 | default y |
732 | 732 | ||
733 | config BLK_DEV_IDE_ICSIDE | 733 | config BLK_DEV_IDE_ICSIDE |
diff --git a/drivers/ide/ide_arm.c b/drivers/ide/ide_arm.c index f728f2927b5a..bdcac94d7c1f 100644 --- a/drivers/ide/ide_arm.c +++ b/drivers/ide/ide_arm.c | |||
@@ -15,15 +15,8 @@ | |||
15 | 15 | ||
16 | #define DRV_NAME "ide_arm" | 16 | #define DRV_NAME "ide_arm" |
17 | 17 | ||
18 | #ifdef CONFIG_ARCH_CLPS7500 | 18 | #define IDE_ARM_IO 0x1f0 |
19 | # include <mach/hardware.h> | 19 | #define IDE_ARM_IRQ IRQ_HARDDISK |
20 | # | ||
21 | # define IDE_ARM_IO (ISASLOT_IO + 0x1f0) | ||
22 | # define IDE_ARM_IRQ IRQ_ISA_14 | ||
23 | #else | ||
24 | # define IDE_ARM_IO 0x1f0 | ||
25 | # define IDE_ARM_IRQ IRQ_HARDDISK | ||
26 | #endif | ||
27 | 20 | ||
28 | static int __init ide_arm_init(void) | 21 | static int __init ide_arm_init(void) |
29 | { | 22 | { |