diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-07-31 00:38:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:39:39 -0700 |
| commit | 99eb8a550dbccc0e1f6c7e866fe421810e0585f6 (patch) | |
| tree | 130c6e3338a0655ba74355eba83afab9261e1ed0 /drivers/ide | |
| parent | 0d0ed42e5ca2e22465c591341839c18025748fe8 (diff) | |
| download | talos-op-linux-99eb8a550dbccc0e1f6c7e866fe421810e0585f6.tar.gz talos-op-linux-99eb8a550dbccc0e1f6c7e866fe421810e0585f6.zip | |
Remove the arm26 port
The arm26 port has been in a state where it was far from even compiling
for quite some time.
Ian Molton agreed with the removal.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/ide/arm/ide_arm.c | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index b1a9b81c211f..e049f65bc3a2 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -833,7 +833,7 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ depends on BLK_DEV_IDE_AU1XXX config IDE_ARM - def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) + def_bool ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) config BLK_DEV_IDE_ICSIDE tristate "ICS IDE interface support" diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c index a3d6744e870a..bce2bec81413 100644 --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c @@ -1,5 +1,5 @@ /* - * ARM/ARM26 default IDE host driver + * ARM default IDE host driver * * Copyright (C) 2004 Bartlomiej Zolnierkiewicz * Based on code by: Russell King, Ian Molton and Alexander Schulz. @@ -14,12 +14,6 @@ #include <asm/mach-types.h> #include <asm/irq.h> -#ifdef CONFIG_ARM26 -# define IDE_ARM_HOST (machine_is_a5k()) -#else -# define IDE_ARM_HOST (1) -#endif - #ifdef CONFIG_ARCH_CLPS7500 # include <asm/arch/hardware.h> # @@ -32,12 +26,10 @@ void __init ide_arm_init(void) { - if (IDE_ARM_HOST) { - hw_regs_t hw; + hw_regs_t hw; - memset(&hw, 0, sizeof(hw)); - ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); - hw.irq = IDE_ARM_IRQ; - ide_register_hw(&hw, 1, NULL); - } + memset(&hw, 0, sizeof(hw)); + ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); + hw.irq = IDE_ARM_IRQ; + ide_register_hw(&hw, 1, NULL); } |
