resync patches

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

diff --git a/target/linux/ixp4xx/patches-2.6.26/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.26/090-increase_entropy_pools.patch
index 55e065e..ec5b681 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/090-increase_entropy_pools.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/090-increase_entropy_pools.patch
@@ -1,6 +1,6 @@
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -248,9 +248,9 @@
+@@ -258,9 +258,9 @@
  /*
   * Configuration information
   */

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 76111fd..0076db2 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
@@ -1,8 +1,8 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -81,6 +81,14 @@
- config MACH_PRONGHORNMETRO
-       def_bool MACH_PRONGHORN
+@@ -89,6 +89,14 @@
+         Engineering Sidewinder board. For more information on this
+         platform, see http://www.adiengineering.com
  
 +config MACH_COMPEX
 +      bool "Compex WP18 / NP18A"
@@ -17,18 +17,18 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -18,6 +18,7 @@
- obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
+@@ -19,6 +19,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
  
  obj-y += common.o
  
-@@ -34,6 +35,7 @@
- obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
+@@ -36,6 +37,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
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

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 edd68ec..4b26933 100644 (file)
--- 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
-@@ -89,6 +89,14 @@
+@@ -97,6 +97,14 @@
          WP18 or NP18A boards. For more information on this
          platform, see http://openwrt.org
  
@@ -17,17 +17,17 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -19,6 +19,7 @@
- obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
+@@ -20,6 +20,7 @@
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
+ obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
 +obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  
  obj-y += common.o
  
-@@ -36,6 +37,7 @@
- obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
+@@ -38,6 +39,7 @@
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
+ 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/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
index 9a00273..564a56b 100644 (file)
--- 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
@@ -184,17 +184,17 @@
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
 @@ -21,6 +21,7 @@
+ obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
 +obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  
  obj-y += common.o
  
 @@ -40,6 +41,7 @@
+ obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
 +obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o

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 4072420..1439985 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
@@ -18,16 +18,16 @@
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
 @@ -22,6 +22,7 @@
+ obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
- obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
 +obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
  
  obj-y += common.o
  
 @@ -42,6 +43,7 @@
+ obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
- obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
 +obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o