diff options
Diffstat (limited to 'target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch index 5b406a7bc7..297571283d 100644 --- a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch +++ b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch @@ -5,10 +5,10 @@ that a 'fixup' routine is avoided. Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:15:56.000000000 -0700 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -22,6 +22,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -17,7 +17,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c static struct flash_platform_data nslu2_flash_data = { .map_name = "cfi_probe", -@@ -157,10 +158,21 @@ +@@ -157,10 +158,21 @@ static void nslu2_power_off(void) gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -41,7 +41,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c ixp4xx_sys_init(); nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -@@ -185,6 +197,6 @@ +@@ -185,6 +197,6 @@ MACHINE_START(NSLU2, "Linksys NSLU2") .boot_params = 0x00000100, .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, @@ -49,11 +49,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c + .timer = &nslu2_timer, .init_machine = nslu2_init, MACHINE_END -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:15:16.000000000 -0700 -@@ -269,7 +269,7 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c +@@ -269,7 +269,7 @@ static struct irqaction ixp4xx_timer_irq .handler = ixp4xx_timer_interrupt, }; @@ -62,11 +62,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c { /* Clear Pending Interrupt by writing '1' to it */ *IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND; -Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.21-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:15:16.000000000 -0700 -@@ -113,6 +113,7 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -113,6 +113,7 @@ extern unsigned long ixp4xx_timer_freq; extern void ixp4xx_map_io(void); extern void ixp4xx_init_irq(void); extern void ixp4xx_sys_init(void); @@ -74,10 +74,10 @@ Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h extern struct sys_timer ixp4xx_timer; extern void ixp4xx_pci_preinit(void); struct pci_sys_data; -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:05:42.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:16:07.000000000 -0700 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -18,6 +18,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -86,7 +86,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c static struct flash_platform_data dsmg600_flash_data = { .map_name = "cfi_probe", -@@ -128,6 +129,19 @@ +@@ -128,6 +129,19 @@ static void dsmg600_power_off(void) gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -106,7 +106,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c static void __init dsmg600_init(void) { ixp4xx_sys_init(); -@@ -155,21 +169,13 @@ +@@ -155,21 +169,13 @@ static void __init dsmg600_init(void) #endif } |