[kernel] refresh 2.6.26 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13135 3c298f89-4303-0410-b956-a3cf2f4a3e73

35 files changed, 117 insertions, 127 deletions

diff --git a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
index 048b9f7465..f5038021d6 100644
--- a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -165,6 +165,7 @@
+@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
  CONFIG_ARCH_IXDP4XX=y
@@ -8,7 +8,7 @@
  CONFIG_CPU_IXP46X=y
  CONFIG_CPU_IXP43X=y
  CONFIG_MACH_GTWX5715=y
-@@ -770,7 +771,7 @@
+@@ -770,7 +771,7 @@ CONFIG_ATA=y
  # CONFIG_SATA_SIL24 is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set
@@ -17,7 +17,7 @@
  # CONFIG_SATA_VITESSE is not set
  # CONFIG_SATA_INIC162X is not set
  # CONFIG_PATA_ALI is not set
-@@ -1143,7 +1144,7 @@
+@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y
  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_VT8231 is not set
@@ -26,7 +26,7 @@
  # CONFIG_SENSORS_W83791D is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set
-@@ -1334,8 +1335,8 @@
+@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y
  #
  # LED drivers
  #
@@ -36,7 +36,7 @@
  
  #
  # LED Triggers
-@@ -1367,7 +1368,7 @@
+@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y
  # CONFIG_RTC_DRV_DS1672 is not set
  # CONFIG_RTC_DRV_MAX6900 is not set
  # CONFIG_RTC_DRV_RS5C372 is not set
@@ -47,7 +47,7 @@
  # CONFIG_RTC_DRV_PCF8583 is not set
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -125,6 +125,15 @@
+@@ -125,6 +125,15 @@ config	ARCH_IXDP4XX
  	depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
  	default y
  
@@ -65,7 +65,7 @@
  #
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -15,6 +15,7 @@
+@@ -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
  obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302v2-pci.o
@@ -73,7 +73,7 @@
  
  obj-y	+= common.o
  
-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)	+= nas100d-se
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)	+= gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)	+= wg302v2-setup.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
index bbdd00c80f..a19a4085ae 100644
--- a/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
 +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
-@@ -76,9 +76,35 @@
+@@ -76,9 +76,35 @@ static struct platform_device gateway700
  	.resource	= &gateway7001_uart_resource,
  };
  
@@ -39,7 +39,7 @@
  static void __init gateway7001_init(void)
 --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
-@@ -77,9 +77,26 @@
+@@ -77,9 +77,26 @@ static struct platform_device wg302v2_ua
  	.resource	= &wg302v2_uart_resource,
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
index 70c91db637..1951ff9acd 100644
--- a/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -155,6 +155,7 @@
+@@ -155,6 +155,7 @@ CONFIG_MACH_AVILA=y
  CONFIG_MACH_LOFT=y
  CONFIG_ARCH_ADI_COYOTE=y
  CONFIG_MACH_GATEWAY7001=y
@@ -10,7 +10,7 @@
  CONFIG_MACH_IXDPG425=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -49,6 +49,14 @@
+@@ -49,6 +49,14 @@ config MACH_GATEWAY7001
  	  7001 Access Point. For more information on this platform,
  	  see http://openwrt.org
  
@@ -27,7 +27,7 @@
  	select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -14,6 +14,7 @@
+@@ -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
  obj-pci-$(CONFIG_MACH_GATEWAY7001)	+= gateway7001-pci.o
@@ -35,7 +35,7 @@
  obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
  
-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NSLU2)	+= nslu2-setup.
  obj-$(CONFIG_MACH_NAS100D)	+= nas100d-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)	+= gateway7001-setup.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
index 45589a8626..dcfb65033f 100644
--- a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
-@@ -157,6 +157,8 @@
+@@ -157,6 +157,8 @@ CONFIG_ARCH_ADI_COYOTE=y
  CONFIG_MACH_GATEWAY7001=y
  CONFIG_MACH_WG302V1=y
  CONFIG_MACH_WG302V2=y
@@ -11,7 +11,7 @@
  CONFIG_MACH_IXDP465=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -65,6 +65,22 @@
+@@ -65,6 +65,22 @@ config MACH_WG302V2
  	  WG302 v2 or WAG302 v2 Access Points. For more information
  	  on this platform, see http://openwrt.org
  
@@ -36,7 +36,7 @@
  	help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001)	+= ga
  obj-pci-$(CONFIG_MACH_WG302V1)		+= wg302v1-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
@@ -44,7 +44,7 @@
  
  obj-y	+= common.o
  
-@@ -32,6 +33,7 @@
+@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001)	+= gatewa
  obj-$(CONFIG_MACH_WG302V1)	+= wg302v1-setup.o
  obj-$(CONFIG_MACH_WG302V2)	+= wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)		+= fsg-setup.o
@@ -375,7 +375,7 @@
 +MACHINE_END
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
-@@ -41,7 +41,8 @@
+@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
  	 * Some boards are using UART2 as console
  	 */
  	if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
diff --git a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
index c2b684d056..b9fa507689 100644
--- a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
-@@ -51,31 +51,31 @@
+@@ -51,31 +51,31 @@ static struct platform_device pronghorn_
  
  static struct resource pronghorn_uart_resources [] = {
  	{
diff --git a/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
index 038d173fc2..9a05fabec4 100644
--- a/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -81,6 +81,14 @@
+@@ -81,6 +81,14 @@ config MACH_PRONGHORN
  config MACH_PRONGHORNMETRO
  	def_bool MACH_PRONGHORN
  
@@ -30,7 +30,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  config ARCH_IXDP425
  	bool "IXDP425"
  	help
-@@ -163,7 +171,7 @@
+@@ -163,7 +171,7 @@ config MACH_FSG
  #
  config CPU_IXP46X
  	bool
@@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  config CPU_IXP43X
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V1)		+= wg302
  obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-pci.o
@@ -49,7 +49,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  
  obj-y	+= common.o
  
-@@ -34,6 +35,7 @@
+@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V1)	+= wg302v1-se
  obj-$(CONFIG_MACH_WG302V2)	+= wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)		+= fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-setup.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
index da685ef74e..19045b05dc 100644
--- a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
@@ -9,7 +9,7 @@
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t	  flash_base;    // Address within FLASH of image
-@@ -32,7 +34,8 @@
+@@ -32,7 +34,8 @@ struct fis_list {
  	struct fis_list *next;
  };
  
@@ -19,7 +19,7 @@
  module_param(directory, int, 0);
  
  static inline int redboot_checksum(struct fis_image_desc *img)
-@@ -61,6 +64,8 @@
+@@ -61,6 +64,8 @@ static int parse_redboot_partitions(stru
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	static char nullstring[] = "unallocated";
  #endif
diff --git a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
index f53ad82334..c4abf7fdad 100644
--- a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -89,6 +89,14 @@
+@@ -89,6 +89,14 @@ config MACH_SIDEWINDER
  	  Engineering Sidewinder board. For more information on this
  	  platform, see http://www.adiengineering.com
  
@@ -32,7 +32,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  	help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_WG302V2)		+= wg302
  obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-pci.o
@@ -40,7 +40,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  
  obj-y	+= common.o
  
-@@ -36,6 +37,7 @@
+@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_WG302V2)	+= wg302v2-se
  obj-$(CONFIG_MACH_FSG)		+= fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-setup.o
@@ -189,7 +189,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 +MACHINE_END
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -66,7 +66,8 @@
+@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
  int __init ixdp425_pci_init(void)
  {
  	if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@@ -201,7 +201,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  }
 --- a/arch/arm/tools/mach-types
 +++ b/arch/arm/tools/mach-types
-@@ -1276,7 +1276,7 @@
+@@ -1276,7 +1276,7 @@ oiab			MACH_OIAB		OIAB			1269
  smdk6400		MACH_SMDK6400		SMDK6400		1270
  nokia_n800		MACH_NOKIA_N800		NOKIA_N800		1271
  greenphone		MACH_GREENPHONE		GREENPHONE		1272
diff --git a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
index 713986dc59..7917240a65 100644
--- a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -97,6 +97,14 @@
+@@ -97,6 +97,14 @@ config MACH_COMPEX
  	  WP18 or NP18A boards. For more information on this
  	  platform, see http://www.compex.com.sg/home/OEM/product_ap.htm
  
@@ -17,7 +17,7 @@
  	help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -20,6 +20,7 @@
+@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_FSG)		+= fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)		+= ixdp425-pci.o
@@ -25,7 +25,7 @@
  
  obj-y	+= common.o
  
-@@ -38,6 +39,7 @@
+@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_FSG)		+= fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)	+= pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)	+= compex-setup.o
@@ -214,7 +214,7 @@
 +#endif
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
  	 */
  	if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
  			 machine_is_gateway7001() || machine_is_wg302v2() ||
diff --git a/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
index f199fc9b95..3ab68c4f3a 100644
--- a/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-@@ -76,9 +76,36 @@
+@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_
  	.resource	= &wrt300nv2_uart_resource,
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
index 16f6f012eb..0721658a3a 100644
--- a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
@@ -154,7 +154,7 @@
 +#endif
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ int __init ixdp425_pci_init(void)
  {
  	if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
  			machine_is_ixdp465() || machine_is_kixrp435() ||
@@ -165,7 +165,7 @@
  }
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -105,6 +105,14 @@
+@@ -105,6 +105,14 @@ config MACH_WRT300NV2
  	  WRT300N v2 router. For more information on this
  	  platform, see http://openwrt.org
  
@@ -182,7 +182,7 @@
  	help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORN)	+= pron
  obj-pci-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)		+= ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)		+= wrt300nv2-pci.o
@@ -190,7 +190,7 @@
  
  obj-y	+= common.o
  
-@@ -40,6 +41,7 @@
+@@ -40,6 +41,7 @@ obj-$(CONFIG_MACH_PRONGHORN)	+= pronghor
  obj-$(CONFIG_MACH_SIDEWINDER)	+= sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)	+= compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)	+= wrt300nv2-setup.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
index f5c5391ccc..a1214d5676 100644
--- a/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/ap1000-setup.c
 +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
-@@ -90,9 +90,37 @@
+@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar
  	.resource		= ap1000_uart_resources
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
index f2d8fde550..684db44751 100644
--- a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -115,6 +115,36 @@
+@@ -115,6 +115,36 @@ static struct platform_device *wg302v1_d
  	&wg302v1_eth[0],
  };
  
@@ -37,7 +37,7 @@
  static void __init wg302v1_init(void)
  {
  	ixp4xx_sys_init();
-@@ -133,6 +163,7 @@
+@@ -133,6 +163,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
  	/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
  	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,
  	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
diff --git a/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
index 1faaa63be1..772b697aa2 100644
--- a/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/coyote-setup.c
 +++ b/arch/arm/mach-ixp4xx/coyote-setup.c
-@@ -73,9 +73,37 @@
+@@ -73,9 +73,37 @@ static struct platform_device coyote_uar
  	.resource	= &coyote_uart_resource,
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
index 1439985116..46198ac64e 100644
--- a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -158,6 +158,14 @@
+@@ -158,6 +158,14 @@ config ARCH_PRPMC1100
  	  PrPCM1100 Processor Mezanine Module. For more information on
  	  this platform, see <file:Documentation/arm/IXP4xx>.
  
@@ -17,7 +17,7 @@
  	prompt "NAS100D"
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER)	+= sid
  obj-pci-$(CONFIG_MACH_COMPEX)		+= ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)		+= wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)		+= ixdp425-pci.o
@@ -25,7 +25,7 @@
  
  obj-y	+= common.o
  
-@@ -42,6 +43,7 @@
+@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_SIDEWINDER)	+= sidewin
  obj-$(CONFIG_MACH_COMPEX)	+= compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)	+= wrt300nv2-setup.o
  obj-$(CONFIG_MACH_AP1000)	+= ap1000-setup.o
@@ -272,7 +272,7 @@
 +subsys_initcall(tw5334_pci_init);
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
-@@ -42,7 +42,8 @@
+@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
  	 */
  	if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
  			 machine_is_gateway7001() || machine_is_wg302v2() ||
diff --git a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
index 14555b4852..5daa936182 100644
--- a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -25,6 +25,14 @@
+@@ -25,6 +25,14 @@ config MACH_AVILA
  	  Avila Network Platform. For more information on this platform,
  	  see <file:Documentation/arm/IXP4xx>.
  
@@ -15,7 +15,7 @@
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA
-@@ -208,7 +216,7 @@
+@@ -208,7 +216,7 @@ config CPU_IXP46X
  
  config CPU_IXP43X
  	bool
@@ -26,7 +26,7 @@
  config MACH_GTWX5715
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,7 @@ obj-pci-n	:=
  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)		+= ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)		+= avila-pci.o
@@ -34,7 +34,7 @@
  obj-pci-$(CONFIG_MACH_IXDPG425)		+= ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o
-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-y	+= common.o
  
  obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)	+= avila-setup.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
index 237c6b3e0a..c93e446d40 100644
--- a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
@@ -8,7 +8,7 @@
  
  struct cambria_board_info {
  	unsigned char	*model;
-@@ -105,6 +106,43 @@
+@@ -105,6 +106,43 @@ static struct platform_device cambria_ua
  	.resource	= &cambria_uart_resource,
  };
  
@@ -52,7 +52,7 @@
  static struct resource cambria_pata_resources[] = {
  	{
  		.flags	= IORESOURCE_MEM
-@@ -287,6 +325,19 @@
+@@ -287,6 +325,19 @@ static void __init cambria_gw23xx_setup(
  #ifdef CONFIG_SENSORS_EEPROM
  static void __init cambria_gw2350_setup(void)
  {
@@ -72,7 +72,7 @@
  	platform_device_register(&cambria_npec_device);
  	platform_device_register(&cambria_npea_device);
  
-@@ -294,10 +345,26 @@
+@@ -294,10 +345,26 @@ static void __init cambria_gw2350_setup(
  	platform_device_register(&cambria_usb1_device);
  
  	platform_device_register(&cambria_gpio_leds_device);
diff --git a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
index 157e1f1698..a9ade59399 100644
--- a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -214,6 +214,21 @@
+@@ -214,6 +214,21 @@ static struct platform_device cambria_gp
  	.dev.platform_data = &cambria_gpio_leds_data,
  };
  
@@ -22,7 +22,7 @@
  
  static struct latch_led cambria_latch_leds[] = {
  	{
-@@ -337,6 +352,11 @@
+@@ -337,6 +352,11 @@ static void __init cambria_gw2350_setup(
  	cambria_optional_uart_data[1].membase	= (void __iomem *)ioremap(0x53FF0000, 0x0fff);
  	cambria_optional_uart_data[1].irq		= IRQ_IXP4XX_GPIO4;
  
@@ -34,7 +34,7 @@
  	platform_device_register(&cambria_optional_uart);
  	platform_device_register(&cambria_npec_device);
  	platform_device_register(&cambria_npea_device);
-@@ -363,6 +383,10 @@
+@@ -363,6 +383,10 @@ static void __init cambria_gw2358_setup(
  	cambria_optional_uart_data[1].membase	= (void __iomem *)ioremap(0x53F80000, 0x0fff);
  	cambria_optional_uart_data[1].irq		= IRQ_IXP4XX_GPIO4;
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
index a4c031aca1..64c1798457 100644
--- a/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-@@ -592,6 +592,8 @@
+@@ -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.26/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
index f0be25315a..8f75415145 100644
--- a/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -165,14 +165,15 @@
+@@ -165,14 +165,15 @@ struct port {
  	struct net_device *netdev;
  	struct napi_struct napi;
  	struct net_device_stats stat;
@@ -18,7 +18,7 @@
  };
  
  /* NPE message structure */
-@@ -316,12 +317,13 @@
+@@ -316,12 +317,13 @@ static void mdio_write(struct net_device
  	spin_unlock_irqrestore(&mdio_lock, flags);
  }
  
@@ -34,7 +34,7 @@
  
  	while (cycles < MAX_MII_RESET_RETRIES) {
  		if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
-@@ -335,12 +337,12 @@
+@@ -335,12 +337,12 @@ static void phy_reset(struct net_device 
  		cycles++;
  	}
  
@@ -50,7 +50,7 @@
  		__raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
  			     &port->regs->tx_control[0]);
  	else
-@@ -348,7 +350,7 @@
+@@ -348,7 +350,7 @@ static void eth_set_duplex(struct port *
  			     &port->regs->tx_control[0]);
  }
  
@@ -59,7 +59,7 @@
  static void phy_check_media(struct port *port, int init)
  {
  	if (mii_check_media(&port->mii, 1, init))
-@@ -367,7 +369,63 @@
+@@ -367,7 +369,63 @@ static void phy_check_media(struct port 
  		}
  	}
  }
@@ -123,7 +123,7 @@
  
  static void mdio_thread(struct work_struct *work)
  {
-@@ -792,9 +850,12 @@
+@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device *
  
  	if (!netif_running(dev))
  		return -EINVAL;
@@ -138,7 +138,7 @@
  	return err;
  }
  
-@@ -947,7 +1008,8 @@
+@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d
  		}
  	}
  
@@ -148,7 +148,7 @@
  
  	memset(&msg, 0, sizeof(msg));
  	msg.cmd = NPE_VLAN_SETRXQOSENTRY;
-@@ -1107,10 +1169,8 @@
+@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device *
  		printk(KERN_CRIT "%s: unable to disable loopback\n",
  		       dev->name);
  
@@ -161,7 +161,7 @@
  
  	if (!ports_open)
  		qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1120,6 +1180,42 @@
+@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device *
  	return 0;
  }
  
@@ -204,7 +204,7 @@
  static int __devinit eth_init_one(struct platform_device *pdev)
  {
  	struct port *port;
-@@ -1192,20 +1288,7 @@
+@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct
  	__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
  	udelay(50);
  
@@ -228,7 +228,7 @@
  	return 0;
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h
-@@ -95,12 +95,15 @@
+@@ -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.26/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
index 699763f518..b6519f0343 100644
--- a/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -322,8 +322,12 @@
+@@ -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;
  	int cycles = 0;
@@ -14,7 +14,7 @@
  
  	while (cycles < MAX_MII_RESET_RETRIES) {
  		if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
-@@ -331,13 +335,23 @@
+@@ -331,13 +335,23 @@ static void phy_reset(struct net_device 
  			printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
  			       dev->name, cycles);
  #endif
diff --git a/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
index 932fae582f..4cefc4427d 100644
--- a/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
 
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-@@ -575,8 +575,8 @@
+@@ -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]);
  
@@ -23,7 +23,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
  			  "IXP42x\n");
  		goto err;
  	}
-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c
  		  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
  		  (image->id >> 8) & 0xFF, image->id & 0xFF);
  
@@ -42,7 +42,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
  #include <asm/arch/npe.h>
  #include <asm/arch/qmgr.h>
  
-@@ -1338,12 +1339,16 @@
+@@ -1338,12 +1339,16 @@ static struct platform_driver drv = {
  
  static int __init eth_init_module(void)
  {
@@ -65,7 +65,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
  	return platform_driver_register(&drv);
 --- a/include/asm-arm/arch-ixp4xx/cpu.h
 +++ b/include/asm-arm/arch-ixp4xx/cpu.h
-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi
  	val &= ~IXP4XX_FEATURE_RESERVED;
  	if (!cpu_is_ixp46x())
  		val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
diff --git a/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
index d20ae7254e..b75cfc898b 100644
--- a/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wan/Kconfig
 +++ b/drivers/net/wan/Kconfig
-@@ -336,6 +336,15 @@
+@@ -336,6 +336,15 @@ config DSCC4_PCI_RST
  
  	  Say Y if your card supports this feature.
  
@@ -18,7 +18,7 @@
  	---help---
 --- a/drivers/net/wan/Makefile
 +++ b/drivers/net/wan/Makefile
-@@ -42,6 +42,7 @@
+@@ -42,6 +42,7 @@ obj-$(CONFIG_C101)		+= c101.o
  obj-$(CONFIG_WANXL)		+= wanxl.o
  obj-$(CONFIG_PCI200SYN)		+= pci200syn.o
  obj-$(CONFIG_PC300TOO)		+= pc300too.o
diff --git a/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
index 1f48980523..1cf1f9ab02 100644
--- a/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
@@ -9,7 +9,7 @@
  
  /* Addresses to scan */
  static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
-@@ -41,26 +43,7 @@
+@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[]
  /* Insmod parameters */
  I2C_CLIENT_INSMOD_1(eeprom);
  
@@ -37,7 +37,7 @@
  
  static int eeprom_attach_adapter(struct i2c_adapter *adapter);
  static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
-@@ -197,6 +180,7 @@
+@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap
  	data->valid = 0;
  	mutex_init(&data->update_lock);
  	data->nature = UNKNOWN;
@@ -45,7 +45,7 @@
  
  	/* Tell the I2C layer a new client has arrived */
  	if ((err = i2c_attach_client(new_client)))
-@@ -224,6 +208,9 @@
+@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap
  	if (err)
  		goto exit_detach;
  
@@ -55,7 +55,7 @@
  	return 0;
  
  exit_detach:
-@@ -249,6 +236,41 @@
+@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i
  	return 0;
  }
  
@@ -173,7 +173,7 @@
 +#endif /* _LINUX_EEPROM_H */
 --- a/include/linux/notifier.h
 +++ b/include/linux/notifier.h
-@@ -253,5 +253,8 @@
+@@ -253,5 +253,8 @@ extern struct blocking_notifier_head reb
  #define VT_UPDATE		0x0004 /* A bigger update occurred */
  #define VT_PREWRITE		0x0005 /* A char is about to be written to the console */
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
index d1f320f443..93fc7cdeb5 100644
--- a/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -117,6 +117,12 @@
+@@ -117,6 +117,12 @@ config LEDS_GPIO
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
  
@@ -159,7 +159,7 @@
 +MODULE_LICENSE("GPL");
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.
  obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o
  obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
@@ -169,7 +169,7 @@
  obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
-@@ -134,5 +134,18 @@
+@@ -134,5 +134,18 @@ struct gpio_led_platform_data {
  					unsigned long *delay_off);
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
index c1c584c612..8ea879fad8 100644
--- a/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -132,6 +132,31 @@
+@@ -132,6 +132,31 @@ static struct platform_device avila_pata
  	.resource		= avila_pata_resources,
  };
  
@@ -32,7 +32,7 @@
  static struct platform_device *avila_devices[] __initdata = {
  	&avila_i2c_gpio,
  	&avila_flash,
-@@ -159,6 +184,8 @@
+@@ -159,6 +184,8 @@ static void __init avila_init(void)
  
  	platform_device_register(&avila_pata);
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
index db25efbea6..aef7558dc4 100644
--- a/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
@@ -33,7 +33,7 @@
  static struct flash_platform_data avila_flash_data = {
  	.map_name	= "cfi_probe",
  	.width		= 2,
-@@ -163,10 +178,160 @@
+@@ -163,10 +178,160 @@ static struct platform_device *avila_dev
  	&avila_uart
  };
  
@@ -194,7 +194,7 @@
  	avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
  	avila_flash_resource.end =
  		IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
-@@ -184,9 +349,28 @@
+@@ -184,9 +349,28 @@ static void __init avila_init(void)
  
  	platform_device_register(&avila_pata);
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
index 7a079f537a..81e9826bfb 100644
--- a/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
@@ -8,7 +8,7 @@
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>
-@@ -172,6 +173,72 @@
+@@ -172,6 +173,72 @@ static struct platform_device avila_npec
  	.dev.platform_data	= &avila_npec_data,
  };
  
@@ -81,7 +81,7 @@
  static struct platform_device *avila_devices[] __initdata = {
  	&avila_i2c_gpio,
  	&avila_flash,
-@@ -182,6 +249,8 @@
+@@ -182,6 +249,8 @@ static void __init avila_gw23xx_setup(vo
  {
  	platform_device_register(&avila_npeb_device);
  	platform_device_register(&avila_npec_device);
@@ -90,7 +90,7 @@
  }
  
  #ifdef CONFIG_SENSORS_EEPROM
-@@ -189,6 +258,8 @@
+@@ -189,6 +258,8 @@ static void __init avila_gw2342_setup(vo
  {
  	platform_device_register(&avila_npeb_device);
  	platform_device_register(&avila_npec_device);
@@ -99,7 +99,7 @@
  }
  
  static void __init avila_gw2345_setup(void)
-@@ -199,22 +270,30 @@
+@@ -199,22 +270,30 @@ static void __init avila_gw2345_setup(vo
  
  	avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
  	platform_device_register(&avila_npec_device);
@@ -130,7 +130,7 @@
  }
  
  static void __init avila_gw2355_setup(void)
-@@ -225,11 +304,29 @@
+@@ -225,11 +304,29 @@ static void __init avila_gw2355_setup(vo
  
  	avila_npec_data.phy = 16;
  	platform_device_register(&avila_npec_device);
diff --git a/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
index 53b8b632a6..38d9ab2a8c 100644
--- a/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -239,10 +239,28 @@
+@@ -239,10 +239,28 @@ static struct platform_device avila_latc
  	.dev.platform_data	= &avila_latch_leds_data,
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
index ece08fd171..cb54c34112 100644
--- a/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -294,6 +294,7 @@
+@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo
  
  static void __init avila_gw2347_setup(void)
  {
@@ -8,7 +8,7 @@
  	platform_device_register(&avila_npeb_device);
  
  	avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-@@ -338,6 +339,7 @@
+@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo
  
  static void __init avila_gw2357_setup(void)
  {
@@ -18,7 +18,7 @@
  	avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -348,6 +348,14 @@
+@@ -348,6 +348,14 @@ static void phy_reset(struct net_device 
  		return;
  	}
  
@@ -35,7 +35,7 @@
  	bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h
-@@ -104,6 +104,8 @@
+@@ -104,6 +104,8 @@ struct eth_plat_info {
  	u8 txreadyq;
  	u8 hwaddr[6];
  	u32 phy_mask;
diff --git a/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
index 688085291c..550b54fd33 100644
--- a/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
@@ -9,7 +9,7 @@
  #include <asm/types.h>
  #include <asm/setup.h>
  #include <asm/memory.h>
-@@ -121,9 +123,41 @@
+@@ -121,9 +123,41 @@ static struct platform_device gtwx5715_f
  	.resource	= &gtwx5715_flash_resource,
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
index 90f750e7a9..29f329017e 100644
--- a/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
 +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-@@ -154,10 +154,37 @@
+@@ -154,10 +154,37 @@ static struct platform_device gtwx5715_s
  	},
  };
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch b/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
index 86a1cea9e2..d6489a7fb8 100644
--- a/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
@@ -63,7 +63,7 @@
  			dev->xfer_shift = ATA_SHIFT_PIO;
  			dev->flags |= ATA_DFLAG_PIO;
  		}
-@@ -48,6 +89,7 @@
+@@ -48,6 +89,7 @@ static unsigned int ixp4xx_mmio_data_xfe
  	unsigned int i;
  	unsigned int words = buflen >> 1;
  	u16 *buf16 = (u16 *) buf;
@@ -71,7 +71,7 @@
  	struct ata_port *ap = dev->link->ap;
  	void __iomem *mmio = ap->ioaddr.data_addr;
  	struct ixp4xx_pata_data *data = ap->host->dev->platform_data;
-@@ -55,8 +97,34 @@
+@@ -55,8 +97,34 @@ static unsigned int ixp4xx_mmio_data_xfe
  	/* set the expansion bus in 16bit mode and restore
  	 * 8 bit mode after the transaction.
  	 */
@@ -108,7 +108,7 @@
  
  	/* Transfer multiple of 2 bytes */
  	if (rw == READ)
-@@ -81,8 +149,24 @@
+@@ -81,8 +149,24 @@ static unsigned int ixp4xx_mmio_data_xfe
  		words++;
  	}
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
index 8d2b4c7a73..2fc1890c89 100644
--- a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/common/dmabounce.c
 +++ b/arch/arm/common/dmabounce.c
-@@ -117,6 +117,10 @@
+@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
  	} else if (size <= device_info->large.size) {
  		pool = &device_info->large;
  	} else {
@@ -13,7 +13,7 @@
  
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -244,6 +244,11 @@
+@@ -244,6 +244,11 @@ config DMABOUNCE
  	default y
  	depends on PCI
  
diff --git a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
index 7af0732258..b6d5d22cab 100644
--- a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig
-===================================================================
---- linux-2.6.26.5.orig/arch/arm/mach-ixp4xx/Kconfig	2008-10-22 22:31:30.000000000 +0100
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig	2008-10-22 22:40:55.000000000 +0100
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
 @@ -97,6 +97,14 @@ config MACH_SIDEWINDER
  	  Engineering Sidewinder board. For more information on this
  	  platform, see http://www.adiengineering.com
@@ -17,10 +15,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig
  config MACH_COMPEX
  	bool "Compex WP18 / NP18A"
  	select PCI
-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Makefile
-===================================================================
---- linux-2.6.26.5.orig/arch/arm/mach-ixp4xx/Makefile	2008-10-22 22:31:37.000000000 +0100
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/Makefile	2008-10-22 22:49:38.000000000 +0100
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
 @@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)		+= ixdp42
  obj-pci-$(CONFIG_MACH_WRT300NV2)		+= wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)		+= ixdp425-pci.o
@@ -37,10 +33,8 @@ Index: linux-2.6.26.5/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.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c	2008-10-22 23:37:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/usr8200-pci.c
 @@ -0,0 +1,78 @@
 +/*
 + * arch/arch/mach-ixp4xx/usr8200-pci.c
@@ -120,10 +114,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c
 +}
 +
 +subsys_initcall(usr8200_pci_init);
-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c	2008-10-22 23:41:48.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
 @@ -0,0 +1,187 @@
 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
@@ -312,10 +304,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c
 +	.boot_params	= 0x0100,
 +	.init_machine	= usr8200_init,
 +MACHINE_END
-Index: linux-2.6.26.5/include/asm-arm/arch-ixp4xx/uncompress.h
-===================================================================
---- linux-2.6.26.5.orig/include/asm-arm/arch-ixp4xx/uncompress.h	2008-10-22 23:27:33.000000000 +0100
-+++ linux-2.6.26.5/include/asm-arm/arch-ixp4xx/uncompress.h	2008-10-22 23:28:09.000000000 +0100
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h
 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
  	if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
  			 machine_is_gateway7001() || machine_is_wg302v2() ||