ide: remove dead <asm-arm/arch-sa1100/ide.h>
PATCH 1/1 ide: remove dead <asm-arm/arch-sa1100/ide.h>
It has been dead for more than 3 years and needs to be converted to use platform PATA support anyway.
--- include/asm-arm/arch-sa1100/ide.h | 75 -------------------------------------- 1 file changed, 75 deletions(-)
include/asm-arm/arch-sa1100/ide.h deleted +0 -75
@@ -1,75 +0,0 @@ -/* -* linux/include/asm-arm/arch-sa1100/ide.h -* -* Copyright (c) 1998 Hugo Fiennes & Nicolas Pitre -* -* 18-aug-2000: Cleanup by Erik Mouw ([email protected]) -* Get rid of the special ide_init_hwif_ports() functions -* and make a generalised function that can be used by all -* architectures. -*/ - -#include <asm/irq.h> -#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. -* This should follow whatever the default interface uses. -*/ -static inline void ide_init_hwif_ports (hw_regs_t *hw,unsigned long data_port, -unsigned long ctrl_port,int *irq) -{ -unsigned long reg = data_port; -int i; -int regincr =1 ; - -/* The Empeg board has the first two address lines unused */ -if (machine_is_empeg ()) - regincr =1 <<2 ; - -/* The LART doesn't use A0 for IDE */ -if (machine_is_lart ()) - regincr =1 <<1 ; - -memset (hw,0 ,sizeof (*hw)); - -for (i =0 ; i <=7 ; i++) { - hw->io_ports_array[i] = reg; - reg += regincr; - } - - hw->io_ports.ctl_addr = ctrl_port; - -if (irq) - *irq =0 ; -} - -/* -* This registers the standard ports for this architecture with the IDE -* driver. -*/ -static __inline__void -ide_init_default_hwifs (void ) -{ -if (machine_is_lart ()) { -#ifdef CONFIG_SA1100_LART -hw_regs_t hw; - -/* Enable GPIO as interrupt line */ -GPDR &= ~LART_GPIO_IDE ; -set_irq_type (LART_IRQ_IDE ,IRQ_TYPE_EDGE_RISING ); - -/* set PCMCIA interface timing */ -MECR =0x00060006 ; - -/* init the interface */ -ide_init_hwif_ports (&hw,PCMCIA_IO_0_BASE +0x0000 ,PCMCIA_IO_0_BASE +0x1000 ,NULL ); - hw.irq =LART_IRQ_IDE ; -ide_register_hw (&hw); -#endif - } -}
Hello.
Quoted 2 lines · Bartlomiej Zolnierkiewicz
It has been dead for more than 3 years and needs to be converted to use platform PATA support anyway.
This patch in the current pata-2.6 series does not apply at all.
Quoted 2 lines
Cc Russell King <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Applying patch ide-remove-dead-asm-arm-arch-sa1100-ide-h.patch The text leading up to this was:
--------------------------
|From: Bartlomiej Zolnierkiewicz <[email protected]> |Subject: [PATCH] ide: remove dead <asm-arm/arch-sa1100/ide.h> | |It has been dead for more than 3 years and needs to be converted |to use platform PATA support anyway. | |Cc: Russell King <[email protected]> |Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> |--- | include/asm-arm/arch-sa1100/ide.h | 75 -------------------------------------- | 1 file changed, 75 deletions(-) | |Index: b/include/asm-arm/arch-sa1100/ide.h |=================================================================== |--- a/include/asm-arm/arch-sa1100/ide.h |+++ /dev/null
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
MBR, Sergei
Quoted 1 line · Sergei Shtylyov
Hello.
You're back!! :)
Quoted 6 lines
Quoted 2 lines · Bartlomiej Zolnierkiewicz
It has been dead for more than 3 years and needs to be converted to use platform PATA support anyway.
This patch in the current pata-2.6 series does not apply at all.
Yeah, Stephen also noticed this while trying to cook new linux-next.
Quoted 6 lines
Quoted 2 lines
Cc Russell King <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Applying patch ide-remove-dead-asm-arm-arch-sa1100-ide-h.patch The text leading up to this was:
--------------------------
Quoted 10 lines
|From: Bartlomiej Zolnierkiewicz <[email protected]> |Subject: [PATCH] ide: remove dead <asm-arm/arch-sa1100/ide.h> | |It has been dead for more than 3 years and needs to be converted |to use platform PATA support anyway. | |Cc: Russell King <[email protected]> |Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> |--- | include/asm-arm/arch-sa1100/ide.h | 75 --------------------------------------
It seems that in the meantime include/asm-arm/arch-sa1100/ide.h became arch/arm/mach-sa1100/include/mach/ide.h. Fixed.
Quoted 11 lines
| 1 file changed, 75 deletions(-) | |Index: b/include/asm-arm/arch-sa1100/ide.h |=================================================================== |--- a/include/asm-arm/arch-sa1100/ide.h |+++ /dev/null--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignoredMBR, Sergei