aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 10:58:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 10:58:03 +0000
commit7758bda7d0615a0fe185b527cb3f4f04a27eb82c (patch)
tree163c4e19a20aa9425d88f18c5fde2cf30e70dc09 /target/linux/ixp4xx/patches-2.6.25
parent51e45450f185c839ecab7062facbecc7cff9953c (diff)
downloadupstream-7758bda7d0615a0fe185b527cb3f4f04a27eb82c.tar.gz
upstream-7758bda7d0615a0fe185b527cb3f4f04a27eb82c.tar.bz2
upstream-7758bda7d0615a0fe185b527cb3f4f04a27eb82c.zip
refresh kernel patches
SVN-Revision: 11204
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch42
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch16
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch32
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch28
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch26
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch20
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch22
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch20
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch26
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch26
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch28
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch12
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch24
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch16
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch16
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch12
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch12
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch18
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch12
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch6
37 files changed, 258 insertions, 258 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
index 29cafd26f3..b29a6a264a 100644
--- a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
@@ -2,10 +2,10 @@
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
1 file changed, 170 insertions(+), 187 deletions(-)
-Index: linux-2.6.25.1/drivers/rtc/rtc-isl1208.c
+Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
===================================================================
---- linux-2.6.25.1.orig/drivers/rtc/rtc-isl1208.c
-+++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c
+--- linux-2.6.25.4.orig/drivers/rtc/rtc-isl1208.c
++++ linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@
#include <linux/bcd.h>
#include <linux/rtc.h>
diff --git a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
index 25f60b42dd..f0ce41f988 100644
--- a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
@@ -2,10 +2,10 @@
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
1 file changed, 32 insertions(+), 77 deletions(-)
-Index: linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c
+Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
===================================================================
---- linux-2.6.25.1.orig/drivers/rtc/rtc-pcf8563.c
-+++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c
+--- linux-2.6.25.4.orig/drivers/rtc/rtc-pcf8563.c
++++ linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@
#include <linux/bcd.h>
#include <linux/rtc.h>
diff --git a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
index cea2e63591..bccbccc695 100644
--- a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
@@ -2,10 +2,10 @@
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 85 deletions(-)
-Index: linux-2.6.25.1/drivers/rtc/rtc-x1205.c
+Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
===================================================================
---- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c
-+++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c
+--- linux-2.6.25.4.orig/drivers/rtc/rtc-x1205.c
++++ linux-2.6.25.4/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@
#include <linux/rtc.h>
#include <linux/delay.h>
diff --git a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
index 5a2fb4ca03..ddbb8a4312 100644
--- a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
@@ -45,10 +45,10 @@ now calls machine_restart() directly.
create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
-Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
+Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/configs/ixp4xx_defconfig
-+++ linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
+--- linux-2.6.25.4.orig/arch/arm/configs/ixp4xx_defconfig
++++ linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
CONFIG_MACH_NAS100D=y
CONFIG_MACH_DSMG600=y
@@ -94,10 +94,10 @@ Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig
CONFIG_RTC_DRV_X1205=y
CONFIG_RTC_DRV_PCF8563=y
# CONFIG_RTC_DRV_PCF8583 is not set
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y
@@ -114,10 +114,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
#
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs
#
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
@@ -134,10 +134,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c
@@ -210,10 +210,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c
+}
+
+subsys_initcall(fsg_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,276 @@
+/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c
@@ -491,10 +491,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c
+ .init_machine = fsg_init,
+MACHINE_END
+
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,50 @@
+/*
+ * include/asm-arm/arch-ixp4xx/fsg.h
@@ -546,10 +546,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h
+#define FSG_LED_USB_BIT 4
+#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@
#include "nslu2.h"
#include "nas100d.h"
@@ -557,10 +557,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_H */
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/irqs.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/irqs.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/irqs.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
diff --git a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
index 4830b19805..4ebee8d66f 100644
--- a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
@@ -18,10 +18,10 @@ KernelVersion: v2.6.25-rc6-117-g457fb60
3 files changed, 268 insertions(+), 0 deletions(-)
create mode 100644 drivers/leds/leds-fsg.c
-Index: linux-2.6.25.1/drivers/leds/Kconfig
+Index: linux-2.6.25.4/drivers/leds/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Kconfig
-+++ linux-2.6.25.1/drivers/leds/Kconfig
+--- linux-2.6.25.4.orig/drivers/leds/Kconfig
++++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -46,6 +46,12 @@ config LEDS_SPITZ
This option enables support for the LEDs on Sharp Zaurus
SL-Cxx00 series (C1000, C3000, C3100).
@@ -35,10 +35,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series"
depends on LEDS_CLASS && PXA_SHARPSL
-Index: linux-2.6.25.1/drivers/leds/Makefile
+Index: linux-2.6.25.4/drivers/leds/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/leds/Makefile
-+++ linux-2.6.25.1/drivers/leds/Makefile
+--- linux-2.6.25.4.orig/drivers/leds/Makefile
++++ linux-2.6.25.4/drivers/leds/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
@@ -47,10 +47,10 @@ Index: linux-2.6.25.1/drivers/leds/Makefile
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
-Index: linux-2.6.25.1/drivers/leds/leds-fsg.c
+Index: linux-2.6.25.4/drivers/leds/leds-fsg.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/leds/leds-fsg.c
++++ linux-2.6.25.4/drivers/leds/leds-fsg.c
@@ -0,0 +1,261 @@
+/*
+ * LED Driver for the Freecom FSG-3
diff --git a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
index 492b84c0d9..7c959554a6 100644
--- a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/char/random.c
+Index: linux-2.6.25.4/drivers/char/random.c
===================================================================
---- linux-2.6.25.1.orig/drivers/char/random.c
-+++ linux-2.6.25.1/drivers/char/random.c
+--- linux-2.6.25.4.orig/drivers/char/random.c
++++ linux-2.6.25.4/drivers/char/random.c
@@ -248,9 +248,9 @@
/*
* Configuration information
diff --git a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
index a32cb7067b..5d92f104b0 100644
--- a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gateway7001-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ static struct platform_device gateway700
.resource = &gateway7001_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
index 7b279e0c20..81b89c7bf7 100644
--- a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v2-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua
.resource = &wg302v2_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
index 156fcb1ade..3f8094daa7 100644
--- a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org
@@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -116,10 +116,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+}
+
+subsys_initcall(pronghornmetro_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,147 @@
+/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -268,10 +268,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+ .init_machine = pronghornmetro_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/Documentation/arm/IXP4xx
+Index: linux-2.6.25.4/Documentation/arm/IXP4xx
===================================================================
---- linux-2.6.25.1.orig/Documentation/arm/IXP4xx
-+++ linux-2.6.25.1/Documentation/arm/IXP4xx
+--- linux-2.6.25.4.orig/Documentation/arm/IXP4xx
++++ linux-2.6.25.4/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus.
@@ -282,10 +282,10 @@ Index: linux-2.6.25.1/Documentation/arm/IXP4xx
Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console
*/
diff --git a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
index 3a523d190b..2cd5a8181c 100644
--- a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ static struct platform_device pronghornm
.resource = pronghornmetro_pata_resources,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
index c0efcb01a8..6326db1acd 100644
--- a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@
+/*
+ * arch/arm/mach-ixp4xx/compex-setup.c
@@ -162,10 +162,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+ .init_machine = compex_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
@@ -175,10 +175,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
pci_common_init(&ixdp425_pci);
return 0;
}
-Index: linux-2.6.25.1/arch/arm/tools/mach-types
+Index: linux-2.6.25.4/arch/arm/tools/mach-types
===================================================================
---- linux-2.6.25.1.orig/arch/arm/tools/mach-types
-+++ linux-2.6.25.1/arch/arm/tools/mach-types
+--- linux-2.6.25.4.orig/arch/arm/tools/mach-types
++++ linux-2.6.25.4/arch/arm/tools/mach-types
@@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
diff --git a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
index ffca727f2a..7c0d76ca26 100644
--- a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/compex-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ static struct platform_device compex_uar
.resource = compex_uart_resources,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
index dfb2546d7c..5665f65e5e 100644
--- a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org
@@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@
+/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
@@ -107,10 +107,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+}
+
+subsys_initcall(wrt300nv2_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -220,10 +220,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+ .init_machine = wrt300nv2_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
*/
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
diff --git a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
index 69f5246173..b1d6dd2011 100644
--- a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_
.resource = &wrt300nv2_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
index 507007ee85..48188a5877 100644
--- a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -26,10 +26,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
default y
config CPU_IXP43X
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
@@ -46,10 +46,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -122,10 +122,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c
+}
+
+subsys_initcall(sidewinder_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@
+/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c
diff --git a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
index 6cfc5beb51..ccbfe28dbb 100644
--- a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -0,0 +1,151 @@
+/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -154,10 +154,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+ .init_machine = ap1000_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
@@ -168,10 +168,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c
pci_common_init(&ixdp425_pci);
return 0;
}
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ config MACH_WRT300NV2
WRT300N v2 router. For more information on this
platform, see http://openwrt.org
@@ -187,10 +187,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425
bool "IXDP425"
help
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) +=
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
diff --git a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
index 2d1a5f2a29..e94046e84f 100644
--- a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar
.resource = ap1000_uart_resources
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
index 0b54355a7b..b0b43348df 100644
--- a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -49,6 +49,14 @@ config MACH_GATEWAY7001
7001 Access Point. For more information on this platform,
see http://openwrt.org
@@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2"
select PCI
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
@@ -0,0 +1,63 @@
+/*
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c
@@ -105,10 +105,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c
+}
+
+subsys_initcall(wg302v1_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -0,0 +1,109 @@
+/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c
diff --git a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
index 03314b5457..332dbcebd9 100644
--- a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v1_ua
.resource = &wg302v1_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
index db8923d36c..b1ecf2ec92 100644
--- a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d
&wg302_eth[0],
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
index ec72314a88..e6a3875763 100644
--- a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/coyote-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/coyote-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/coyote-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -73,9 +73,37 @@ static struct platform_device coyote_uar
.resource = &coyote_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
index 3b7ad83c96..e4a8bf5eee 100644
--- a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -150,6 +150,14 @@ config ARCH_PRPMC1100
PrPCM1100 Processor Mezanine Module. For more information on
this platform, see <file:Documentation/arm/IXP4xx>.
@@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config MACH_NAS100D
bool
prompt "NAS100D"
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -0,0 +1,162 @@
+/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -204,10 +204,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c
+ .init_machine = tw5334_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
@@ -0,0 +1,69 @@
+/*
+ * arch/arch/mach-ixp4xx/tw5334-pci.c
@@ -278,10 +278,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c
+}
+
+subsys_initcall(tw5334_pci_init);
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
*/
if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
diff --git a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
index ccd4045a8a..ee207d1014 100644
--- a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -25,6 +25,14 @@ config MACH_AVILA
Avila Network Platform. For more information on this platform,
see <file:Documentation/arm/IXP4xx>.
@@ -26,10 +26,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
default y
config MACH_GTWX5715
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -7,6 +7,7 @@ obj-pci-n :=
obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o
@@ -46,10 +46,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
@@ -0,0 +1,74 @@
+/*
+ * arch/arch/mach-ixp4xx/cambria-pci.c
@@ -125,10 +125,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c
+}
+
+subsys_initcall(cambria_pci_init);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,250 @@
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
@@ -380,10 +380,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c
+ .init_machine = cambria_init,
+MACHINE_END
+#endif
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
@@ -18,7 +18,7 @@
#define __ASM_ARCH_HARDWARE_H__
diff --git a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
index 4faad529ae..9b34b8a2b1 100644
--- a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/arm/Kconfig
+Index: linux-2.6.25.4/drivers/net/arm/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/Kconfig
-+++ linux-2.6.25.1/drivers/net/arm/Kconfig
+--- linux-2.6.25.4.orig/drivers/net/arm/Kconfig
++++ linux-2.6.25.4/drivers/net/arm/Kconfig
@@ -47,3 +47,11 @@ config EP93XX_ETH
help
This is a driver for the ethernet hardware included in EP93xx CPUs.
@@ -14,19 +14,19 @@ Index: linux-2.6.25.1/drivers/net/arm/Kconfig
+ help
+ Say Y here if you want to use built-in Ethernet ports
+ on IXP4xx processor.
-Index: linux-2.6.25.1/drivers/net/arm/Makefile
+Index: linux-2.6.25.4/drivers/net/arm/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/Makefile
-+++ linux-2.6.25.1/drivers/net/arm/Makefile
+--- linux-2.6.25.4.orig/drivers/net/arm/Makefile
++++ linux-2.6.25.4/drivers/net/arm/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o
-Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -0,0 +1,1265 @@
+/*
+ * Intel IXP4xx Ethernet driver for Linux
@@ -1293,10 +1293,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+MODULE_ALIAS("platform:ixp4xx_eth");
+module_init(eth_init_module);
+module_exit(eth_cleanup_module);
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co
return -ETIMEDOUT;
}
@@ -1317,10 +1317,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
return 0;
}
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que
case 3: mask[0] = 0xFF; break;
}
diff --git a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
index dce76554ac..c269caf9d3 100644
--- a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c
npe_reset(npe);
#endif
diff --git a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
index 93a5d2d1fc..510401768a 100644
--- a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -165,14 +165,15 @@ struct port {
struct net_device *netdev;
struct napi_struct napi;
@@ -228,10 +228,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
return 0;
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
@@ -95,12 +95,15 @@ struct sys_timer;
#define IXP4XX_ETH_NPEB 0x10
#define IXP4XX_ETH_NPEC 0x20
diff --git a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
index 7d635deac5..b53bf5f79c 100644
--- a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -322,8 +322,12 @@ static void phy_reset(struct net_device
struct port *port = netdev_priv(dev);
int phy_id = port->mii[idx].phy_id;
diff --git a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
index 18d5d87371..264a99ef4f 100644
--- a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c
for (i = 0; i < image->size; i++)
image->data[i] = swab32(image->data[i]);
@@ -22,10 +22,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c
if (!npe->id)
instr_size = NPE_A_42X_INSTR_SIZE;
else
-Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -32,6 +32,7 @@
#include <linux/kernel.h>
#include <linux/mii.h>
@@ -55,10 +55,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
return platform_driver_register(&drv);
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/cpu.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/cpu.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h
@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi
val &= ~IXP4XX_FEATURE_RESERVED;
if (!cpu_is_ixp46x())
@@ -68,10 +68,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h
return val;
}
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -628,11 +628,12 @@
#define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22)
#define IXP4XX_FEATURE_RESERVED (0xFF << 24)
diff --git a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
index c3349f158a..50683fdd58 100644
--- a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/net/wan/Kconfig
+Index: linux-2.6.25.4/drivers/net/wan/Kconfig
===================================================================
---- linux-2.6.25.1.orig/drivers/net/wan/Kconfig
-+++ linux-2.6.25.1/drivers/net/wan/Kconfig
+--- linux-2.6.25.4.orig/drivers/net/wan/Kconfig
++++ linux-2.6.25.4/drivers/net/wan/Kconfig
@@ -338,6 +338,15 @@ config DSCC4_PCI_RST
Say Y if your card supports this feature.
@@ -18,10 +18,10 @@ Index: linux-2.6.25.1/drivers/net/wan/Kconfig
config DLCI
tristate "Frame Relay DLCI support"
---help---
-Index: linux-2.6.25.1/drivers/net/wan/Makefile
+Index: linux-2.6.25.4/drivers/net/wan/Makefile
===================================================================
---- linux-2.6.25.1.orig/drivers/net/wan/Makefile
-+++ linux-2.6.25.1/drivers/net/wan/Makefile
+--- linux-2.6.25.4.orig/drivers/net/wan/Makefile
++++ linux-2.6.25.4/drivers/net/wan/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o
obj-$(CONFIG_WANXL) += wanxl.o
obj-$(CONFIG_PCI200SYN) += pci200syn.o
@@ -30,10 +30,10 @@ Index: linux-2.6.25.1/drivers/net/wan/Makefile
clean-files := wanxlfw.inc
$(obj)/wanxl.o: $(obj)/wanxlfw.inc
-Index: linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c
+Index: linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c
++++ linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c
@@ -0,0 +1,2886 @@
+/*
+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux
diff --git a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
index e8e59dfb27..5849a7b1a3 100644
--- a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c
+Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
===================================================================
---- linux-2.6.25.1.orig/drivers/i2c/chips/eeprom.c
-+++ linux-2.6.25.1/drivers/i2c/chips/eeprom.c
+--- linux-2.6.25.4.orig/drivers/i2c/chips/eeprom.c
++++ linux-2.6.25.4/drivers/i2c/chips/eeprom.c
@@ -33,6 +33,8 @@
#include <linux/jiffies.h>
#include <linux/i2c.h>
@@ -99,10 +99,10 @@ Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c
static int __init eeprom_init(void)
{
return i2c_add_driver(&eeprom_driver);
-Index: linux-2.6.25.1/include/linux/eeprom.h
+Index: linux-2.6.25.4/include/linux/eeprom.h
===================================================================
--- /dev/null
-+++ linux-2.6.25.1/include/linux/eeprom.h
++++ linux-2.6.25.4/include/linux/eeprom.h
@@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H
+#define _LINUX_EEPROM_H
@@ -175,10 +175,10 @@ Index: linux-2.6.25.1/include/linux/eeprom.h
+extern int unregister_eeprom_notifier(struct notifier_block *nb);
+
+#endif /* _LINUX_EEPROM_H */
-Index: linux-2.6.25.1/include/linux/notifier.h
+Index: linux-2.6.25.4/include/linux/notifier.h
===================================================================
---- linux-2.6.25.1.orig/include/linux/notifier.h
-+++ linux-2.6.25.1/include/linux/notifier.h
+--- linux-2.6.25.4.orig/include/linux/notifier.h
++++ linux-2.6.25.4/include/linux/notifier.h
@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb
#define VT_WRITE 0x0003 /* A char got output */
#define VT_UPDATE 0x0004 /* A bigger update occurred */
diff --git a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
index 4c103acce4..26267c827b 100644
--- a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -132,6 +132,31 @@ static struct platform_device avila_pata
.resource = avila_pata_resources,
};
diff --git a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
index 7f2d611aa4..1d154c6691 100644
--- a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,10 +14,18 @@
#include <linux/kernel.h>
#include <linux/init.h>
diff --git a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
index 14be023f77..b7e4940163 100644
--- a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -36,4 +36,6 @@
#define AVILA_PCI_INTC_PIN 9
#define AVILA_PCI_INTD_PIN 8
@@ -10,10 +10,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+/* User LEDs */
+#define AVILA_GW23XX_LED_USER_GPIO 3
+#define AVILA_GW23X7_LED_USER_GPIO 4
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -26,6 +26,7 @@
# include <linux/eeprom.h>
#endif
diff --git a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
index 8c91f0d0b8..7e4e3b9ef4 100644
--- a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -192,10 +192,28 @@ static struct platform_device avila_leds
.dev.platform_data = &avila_leds_data,
};
@@ -32,10 +32,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
};
static void __init avila_gw23xx_setup(void)
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -39,3 +39,6 @@
/* User LEDs */
#define AVILA_GW23XX_LED_USER_GPIO 3
diff --git a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
index fa91b38f2d..3e5c3fe052 100644
--- a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo
static void __init avila_gw2347_setup(void)
@@ -18,10 +18,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c
platform_device_register(&avila_npeb_device);
avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
---- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c
-+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
+--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -348,6 +348,14 @@ static void phy_reset(struct net_device
return;
}
@@ -37,10 +37,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c
/* restart auto negotiation */
bmcr = mdio_read(dev, phy_id, MII_BMCR);
bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
@@ -104,6 +104,8 @@ struct eth_plat_info {
u8 txreadyq;
u8 hwaddr[6];
diff --git a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
index 2b7cd76eb1..9831cd515b 100644
--- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/arch/arm/common/dmabounce.c
+Index: linux-2.6.25.4/arch/arm/common/dmabounce.c
===================================================================
---- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c
-+++ linux-2.6.25.1/arch/arm/common/dmabounce.c
+--- linux-2.6.25.4.orig/arch/arm/common/dmabounce.c
++++ linux-2.6.25.4/arch/arm/common/dmabounce.c
@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) {
pool = &device_info->large;
@@ -13,10 +13,10 @@ Index: linux-2.6.25.1/arch/arm/common/dmabounce.c
pool = NULL;
}
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
+--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -236,6 +236,11 @@ config DMABOUNCE
default y
depends on PCI
diff --git a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
index 0ec214918a..74bc9ae42b 100644
--- a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
===================================================================
---- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h
+--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -25,7 +25,7 @@
/*
* AVILA PCI IRQs