refresh ixp4xx patches to match upstream style

author Imre Kaloz <kaloz@openwrt.org>

Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)

committer Imre Kaloz <kaloz@openwrt.org>

Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)
author Imre Kaloz <kaloz@openwrt.org>
Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)
committer Imre Kaloz <kaloz@openwrt.org>
Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)
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 b29a6a264a1cf491152f73c241b0f45ed09f53db..e5eac05e26268ebaca55a66c27bcb62b28da4f36 100644 (file)
--- 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,8 @@
   drivers/rtc/rtc-isl1208.c |  357 +++++++++++++++++++++-------------------------
   1 file changed, 170 insertions(+), 187 deletions(-)
  
-Index: linux-2.6.25.4/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
+--- a/drivers/rtc/rtc-isl1208.c
++++ b/drivers/rtc/rtc-isl1208.c
  @@ -15,16 +15,15 @@
   #include <linux/bcd.h>
   #include <linux/rtc.h>
@@ -93,7 +91,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
         BUG_ON(reg > ISL1208_REG_USR2);
         BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
   
-@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client 
+@@ -103,15 +84,14 @@
   /* block write */
   static int
   isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
@@ -111,7 +109,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
         BUG_ON(reg > ISL1208_REG_USR2);
         BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
   
-@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client *
+@@ -125,7 +105,8 @@
   }
   
   /* simple check to see wether we have a isl1208 */
@@ -121,7 +119,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
         u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
-@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(s
+@@ -139,24 +120,29 @@
                 return ret;
   
         for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
@@ -157,7 +155,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   
         /* The 6bit value in the ATR register controls the load
          * capacitance C_load * in steps of 0.25pF
-@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2
+@@ -169,51 +155,54 @@
          *
          */
   
@@ -225,7 +223,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         struct i2c_client *const client = to_i2c_client(dev);
         int sr, dtr, atr, usr;
-@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct devic
+@@ -230,20 +219,19 @@
                    (sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
                    (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
                    (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
@@ -249,7 +247,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   
         usr = isl1208_i2c_get_usr(client);
         if (usr >= 0)
-@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct devic
+@@ -252,9 +240,8 @@
         return 0;
   }
   
@@ -261,7 +259,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         int sr;
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
-@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct 
+@@ -274,27 +261,30 @@
   
         tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
         tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
@@ -299,7 +297,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         struct rtc_time *const tm = &alarm->time;
         u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
-@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct
+@@ -307,7 +297,7 @@
         }
   
         sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
@@ -308,7 +306,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
         if (sr < 0) {
                 dev_err(&client->dev, "%s: reading alarm section failed\n",
                         __func__);
-@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct
+@@ -315,23 +305,25 @@
         }
   
         /* MSB of each alarm register is an enable bit */
@@ -343,7 +341,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         int sr;
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
-@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i
+@@ -353,7 +345,7 @@
         }
   
         /* set WRTC */
@@ -352,7 +350,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
                                        sr | ISL1208_REG_SR_WRTC);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: writing SR failed\n", __func__);
-@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i
+@@ -369,7 +361,7 @@
         }
   
         /* clear WRTC again */
@@ -361,7 +359,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
                                        sr & ~ISL1208_REG_SR_WRTC);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: writing SR failed\n", __func__);
-@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i
+@@ -380,70 +372,69 @@
   }
   
   
@@ -460,7 +458,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
   {
         int usr = -1;
   
-@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(s
+@@ -460,124 +451,116 @@
   
         return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
   }
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 f0ce41f988dbecac8df81ab4fe7ca7f20e890d24..400da84b0ad82763da6b38c21b21ea5c3e8e29a5 100644 (file)
--- 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,8 @@
   drivers/rtc/rtc-pcf8563.c |  109 +++++++++++++---------------------------------
   1 file changed, 32 insertions(+), 77 deletions(-)
  
-Index: linux-2.6.25.4/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
+--- a/drivers/rtc/rtc-pcf8563.c
++++ b/drivers/rtc/rtc-pcf8563.c
  @@ -18,17 +18,7 @@
   #include <linux/bcd.h>
   #include <linux/rtc.h>
@@ -25,7 +23,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
   
   #define PCF8563_REG_ST1               0x00 /* status */
   #define PCF8563_REG_ST2               0x01
-@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD;
+@@ -53,8 +43,10 @@
   #define PCF8563_SC_LV         0x80 /* low voltage */
   #define PCF8563_MO_C          0x80 /* century */
   
@@ -37,7 +35,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
         /*
          * The meaning of MO_C bit varies by the chip type.
          * From PCF8563 datasheet: this bit is toggled when the years
-@@ -72,16 +64,13 @@ struct pcf8563 {
+@@ -72,16 +64,13 @@
         int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
   };
   
@@ -55,7 +53,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
         unsigned char buf[13] = { PCF8563_REG_ST1 };
   
         struct i2c_msg msgs[] = {
-@@ -138,7 +127,7 @@ static int pcf8563_get_datetime(struct i
+@@ -138,7 +127,7 @@
   
   static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
   {
@@ -64,7 +62,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
         int i, err;
         unsigned char buf[9];
   
-@@ -257,100 +246,66 @@ static const struct rtc_class_ops pcf856
+@@ -257,100 +246,66 @@
         .set_time       = pcf8563_rtc_set_time,
   };
   
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 bccbccc6951aa1623523c72c5b880aac33452bcc..0cc1c5120b1036676ead5d0ff7a0b586f7728ad8 100644 (file)
--- 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,8 @@
   drivers/rtc/rtc-x1205.c |  128 ++++++++++++++++--------------------------------
   1 file changed, 43 insertions(+), 85 deletions(-)
  
-Index: linux-2.6.25.4/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
+--- a/drivers/rtc/rtc-x1205.c
++++ b/drivers/rtc/rtc-x1205.c
  @@ -22,20 +22,7 @@
   #include <linux/rtc.h>
   #include <linux/delay.h>
@@ -28,7 +26,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
   
   /* offsets into CCR area */
   
-@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD;
+@@ -91,19 +78,7 @@
   
   #define X1205_HR_MIL          0x80    /* Set in ccr.hour for 24 hr mode */
   
@@ -49,7 +47,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
   
   /*
    * In the routines that deal directly with the x1205 hardware, we use
-@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st
+@@ -497,58 +472,51 @@
   }
   static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
   
@@ -135,7 +133,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
   
         i2c_set_clientdata(client, rtc);
   
-@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte
+@@ -565,45 +533,35 @@
         else
                 dev_err(&client->dev, "couldn't read status\n");
   
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 ddbb8a43125febd96978d3ad5bb5b8c810f09350..8fb7280e079bca32e8d88967840d37f727414556 100644 (file)
--- 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,11 +45,9 @@ 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.4/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
+--- a/arch/arm/configs/ixp4xx_defconfig
++++ b/arch/arm/configs/ixp4xx_defconfig
+@@ -165,6 +165,7 @@
   CONFIG_MACH_NAS100D=y
   CONFIG_MACH_DSMG600=y
   CONFIG_ARCH_IXDP4XX=y
@@ -57,7 +55,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
   CONFIG_CPU_IXP46X=y
   CONFIG_CPU_IXP43X=y
   CONFIG_MACH_GTWX5715=y
-@@ -770,7 +771,7 @@ CONFIG_ATA=y
+@@ -770,7 +771,7 @@
   # CONFIG_SATA_SIL24 is not set
   # CONFIG_SATA_SIS is not set
   # CONFIG_SATA_ULI is not set
@@ -66,7 +64,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
   # CONFIG_SATA_VITESSE is not set
   # CONFIG_SATA_INIC162X is not set
   # CONFIG_PATA_ALI is not set
-@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y
+@@ -1143,7 +1144,7 @@
   # CONFIG_SENSORS_VIA686A is not set
   # CONFIG_SENSORS_VT1211 is not set
   # CONFIG_SENSORS_VT8231 is not set
@@ -75,7 +73,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
   # CONFIG_SENSORS_W83791D is not set
   # CONFIG_SENSORS_W83792D is not set
   # CONFIG_SENSORS_W83793 is not set
-@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y
+@@ -1334,8 +1335,8 @@
   #
   # LED drivers
   #
@@ -85,7 +83,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
   
   #
   # LED Triggers
-@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y
+@@ -1367,7 +1368,7 @@
   # CONFIG_RTC_DRV_DS1672 is not set
   # CONFIG_RTC_DRV_MAX6900 is not set
   # CONFIG_RTC_DRV_RS5C372 is not set
@@ -94,11 +92,9 @@ Index: linux-2.6.25.4/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.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -125,6 +125,15 @@
         depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
         default y
   
@@ -114,11 +110,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   #
   # Certain registers and IRQs are only enabled if supporting IXP465 CPUs
   #
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -15,6 +15,7 @@
   obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
   obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
   obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
@@ -126,7 +120,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)   += nas100d-se
+@@ -28,6 +29,7 @@
   obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
   obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
   obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
@@ -134,10 +128,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/fsg-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
++++ b/arch/arm/mach-ixp4xx/fsg-pci.c
  @@ -0,0 +1,71 @@
  +/*
  + * arch/arch/mach-ixp4xx/fsg-pci.c
@@ -210,10 +202,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
  +}
  +
  +subsys_initcall(fsg_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
++++ b/arch/arm/mach-ixp4xx/fsg-setup.c
  @@ -0,0 +1,276 @@
  +/*
  + * arch/arm/mach-ixp4xx/fsg-setup.c
@@ -491,10 +481,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
  +      .init_machine   = fsg_init,
  +MACHINE_END
  +
-Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
++++ b/include/asm-arm/arch-ixp4xx/fsg.h
  @@ -0,0 +1,50 @@
  +/*
  + * include/asm-arm/arch-ixp4xx/fsg.h
@@ -546,10 +534,8 @@ Index: linux-2.6.25.4/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.4/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
+--- a/include/asm-arm/arch-ixp4xx/hardware.h
++++ b/include/asm-arm/arch-ixp4xx/hardware.h
  @@ -45,5 +45,6 @@
   #include "nslu2.h"
   #include "nas100d.h"
@@ -557,10 +543,8 @@ Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
  +#include "fsg.h"
   
   #endif  /* _ASM_ARCH_HARDWARE_H */
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/irqs.h
++++ b/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 4ebee8d66feebf01da2d35f8b4b04ff6aa863ca3..051fc7cd0c8f8ac5a3343ea23f29496220f80ce4 100644 (file)
--- 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,11 +18,9 @@ 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.4/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
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -46,6 +46,12 @@
           This option enables support for the LEDs on Sharp Zaurus
           SL-Cxx00 series (C1000, C3000, C3100).
   
@@ -35,11 +33,9 @@ Index: linux-2.6.25.4/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.4/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
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -22,6 +22,7 @@
   obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
   obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
   obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
@@ -47,10 +43,8 @@ Index: linux-2.6.25.4/drivers/leds/Makefile
   
   # LED Triggers
   obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-Index: linux-2.6.25.4/drivers/leds/leds-fsg.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/drivers/leds/leds-fsg.c
++++ b/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 7c959554a60aa51605d600f316190cbfeb9e85e0..55e065edb794ac7fcb460ea93bbdbf82151d32b4 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/drivers/char/random.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/char/random.c
-+++ linux-2.6.25.4/drivers/char/random.c
+--- a/drivers/char/random.c
++++ b/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 5d92f104b0ca26b79770314b25826ed0f2544324..a2ebb1a83a467df55143303dce710ddc928b5f84 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
++++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
+@@ -76,9 +76,36 @@
         .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 81b89c7bf76c9b2193bb33fa96ad7a28eb12d8bf..850947fc8964e2accdb1f1e98b2a7500559ea2a1 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
++++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
+@@ -77,9 +77,27 @@
         .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 3f8094daa799f1ead2d8bc243006345336fdbfbb..6908a28adb937b5d186e6c78dab91aa2bda6c563 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -57,6 +57,14 @@
           WG302 v2 or WAG302 v2 Access Points. For more information
           on this platform, see http://openwrt.org
   
@@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config ARCH_IXDP425
         bool "IXDP425"
         help
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -16,6 +16,7 @@
   obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
   obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
   obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
@@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -30,6 +31,7 @@ obj-$(CONFIG_MACH_DSMG600)      += dsmg6
+@@ -30,6 +31,7 @@
   obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
   obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
   obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
@@ -37,10 +33,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
++++ b/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
  @@ -0,0 +1,74 @@
  +/*
  + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -116,10 +110,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
  +}
  +
  +subsys_initcall(pronghornmetro_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ b/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
  @@ -0,0 +1,147 @@
  +/*
  + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -268,11 +260,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
  +      .init_machine   = pronghornmetro_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/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
+--- a/Documentation/arm/IXP4xx
++++ b/Documentation/arm/IXP4xx
+@@ -111,6 +111,9 @@
      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,11 +272,9 @@ Index: linux-2.6.25.4/Documentation/arm/IXP4xx
   Gateworks Avila Network Platform
   http://www.gateworks.com/avila_sbc.htm
   
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -41,7 +41,8 @@
          * Some boards are using UART2 as console
          */
         if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
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 2cd5a8181c53d0b584e6d460185a0a899325dc11..3450b5b02c50e68bb50dba07b81f2b9ff0251eda 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ b/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -104,9 +104,36 @@
         .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 6326db1acdfbdc7f426fe73c026fe859ae1c49c4..689d7a3c70e7727507d17b9e484e28919d521ef5 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@
           Engineering Pronghorn Metro Platform. For more
           information on this platform, see <file:Documentation/arm/IXP4xx>.
   
@@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config ARCH_IXDP425
         bool "IXDP425"
         help
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -17,6 +17,7 @@
   obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
   obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
   obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001)       += gatewa
+@@ -32,6 +33,7 @@
   obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
   obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
   obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
@@ -37,10 +33,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/compex-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
++++ b/arch/arm/mach-ixp4xx/compex-setup.c
  @@ -0,0 +1,120 @@
  +/*
  + * arch/arm/mach-ixp4xx/compex-setup.c
@@ -162,11 +156,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
  +      .init_machine   = compex_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/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 = {
+--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
+@@ -66,7 +66,7 @@
   int __init ixdp425_pci_init(void)
   {
         if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@@ -175,11 +167,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
                 pci_common_init(&ixdp425_pci);
         return 0;
   }
-Index: linux-2.6.25.4/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
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -1276,7 +1276,7 @@
   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.25/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch

index 7c0d76ca269987b340dc27fa71757c75b44dc16c..fb71edc14699066a8f6d5b539b6db0a3709098f5 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/compex-setup.c
++++ b/arch/arm/mach-ixp4xx/compex-setup.c
+@@ -90,9 +90,36 @@
         .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 5665f65e5e27df78323ed839bfa8174630d46a54..b797cb425cb22b72892cb912920f751033df4d3d 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -73,6 +73,14 @@
           WP18 or NP18A boards. For more information on this
           platform, see http://openwrt.org
   
@@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config ARCH_IXDP425
         bool "IXDP425"
         help
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -18,6 +18,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
@@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V2)   += wg302v2-se
+@@ -34,6 +35,7 @@
   obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
   obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
   obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
@@ -37,10 +33,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
++++ b/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
  @@ -0,0 +1,65 @@
  +/*
  + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
@@ -107,10 +101,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
  +}
  +
  +subsys_initcall(wrt300nv2_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
  @@ -0,0 +1,108 @@
  +/*
  + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -220,11 +212,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
  +      .init_machine   = wrt300nv2_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -42,7 +42,7 @@
          */
         if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                          machine_is_gateway7001() || machine_is_wg302v2() ||
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 b1d6dd201139da7a84270f06f2ee64b9739d23ac..f199fc9b954735e6be77850b7e711e302f4b1869 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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_
+--- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+@@ -76,9 +76,36 @@
         .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 48188a5877abc5113f86aca9eefab1a9da531e4b..50f6e2752214c78023712af75ab91aa4015ccbc6 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@
           Engineering Pronghorn Metro Platform. For more
           information on this platform, see <file:Documentation/arm/IXP4xx>.
   
@@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config MACH_COMPEX
         bool "Compex WP18 / NP18A"
         select PCI
-@@ -163,7 +171,7 @@ config MACH_FSG
+@@ -163,7 +171,7 @@
   #
   config CPU_IXP46X
         bool
@@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
         default y
   
   config CPU_IXP43X
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -19,6 +19,7 @@
   obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
   obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
   obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
@@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG)               += fsg-setup.o
+@@ -36,6 +37,7 @@
   obj-$(CONFIG_MACH_PRONGHORNMETRO)     += pronghornmetro-setup.o
   obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
   obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
@@ -46,10 +42,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
++++ b/arch/arm/mach-ixp4xx/sidewinder-pci.c
  @@ -0,0 +1,71 @@
  +/*
  + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -122,10 +116,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
  +}
  +
  +subsys_initcall(sidewinder_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c
++++ b/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 ccbfe28dbbe4fe9ebbc28d46d53430dfe572b43b..d6d7cf6f7797682a5548aaffb4c2b5020e841de9 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
++++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
  @@ -0,0 +1,151 @@
  +/*
  + * arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -154,11 +152,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
  +      .init_machine   = ap1000_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/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 = {
+--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
+@@ -66,7 +66,8 @@
   int __init ixdp425_pci_init(void)
   {
         if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@@ -168,11 +164,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
                 pci_common_init(&ixdp425_pci);
         return 0;
   }
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -89,6 +89,14 @@
           WRT300N v2 router. For more information on this
           platform, see http://openwrt.org
   
@@ -187,11 +181,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config ARCH_IXDP425
         bool "IXDP425"
         help
-Index: linux-2.6.25.4/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)        +=
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -20,6 +20,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
@@ -199,7 +191,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO)    += pro
+@@ -38,6 +39,7 @@
   obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
   obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
   obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.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 e94046e84fab945214e0ea9fffb09a3536896c05..f5c5391ccc4365e1542e4b232428ae8c471d52c3 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/ap1000-setup.c
++++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
+@@ -90,9 +90,37 @@
         .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 b0b43348df8eabf3d5d9dd4f40b5131abd0135de..a5a6e5ca965e3a06f8296d26a281762dbd7f042e 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -49,6 +49,14 @@
           7001 Access Point. For more information on this platform,
           see http://openwrt.org
   
@@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config MACH_WG302V2
         bool "Netgear WG302 v2 / WAG302 v2"
         select PCI
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -14,6 +14,7 @@
   obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
   obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
   obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
@@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
   obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
   obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
-@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2)     += nslu2-setup.
+@@ -33,6 +34,7 @@
   obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
   obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
   obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
@@ -37,10 +33,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
++++ b/arch/arm/mach-ixp4xx/wg302v1-pci.c
  @@ -0,0 +1,63 @@
  +/*
  + * arch/arch/mach-ixp4xx/wg302v1-pci.c
@@ -105,10 +99,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
  +}
  +
  +subsys_initcall(wg302v1_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ b/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 332dbcebd952c7081b54aa85cd5ecef2b7f662f4..76066fb9a21c41023309184cd567ef64dd89714f 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -77,9 +77,27 @@
         .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 b1ecf2ec924f571ff03fc4a7eb86770fc3584faf..f89698cca4d7670cc30a5b287d3c5a60157f29a6 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -100,6 +100,36 @@
         &wg302_eth[0],
   };
   
@@ -39,7 +37,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
   static void __init wg302v1_init(void)
   {
         ixp4xx_sys_init();
-@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
+@@ -118,6 +148,7 @@
         /* 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.25/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch

index e6a387576324adf992d098b3067ccb6499d1bf02..1faaa63be1881091a7f6d0abbfd827d967c2f84f 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/coyote-setup.c
++++ b/arch/arm/mach-ixp4xx/coyote-setup.c
+@@ -73,9 +73,37 @@
         .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 e4a8bf5eee8732d7c8afc4128aa8f4d6ea5b41c6..c403a87fc987a0806e011695a01c15ad7ec63821 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -150,6 +150,14 @@
           PrPCM1100 Processor Mezanine Module. For more information on
           this platform, see <file:Documentation/arm/IXP4xx>.
   
@@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config MACH_NAS100D
         bool
         prompt "NAS100D"
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -22,6 +22,7 @@
   obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
   obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
   obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
@@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   
   obj-y += common.o
   
-@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_COMPEX)    += compex-setu
+@@ -42,6 +43,7 @@
   obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
   obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
   obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
@@ -37,10 +33,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/tw5334-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
++++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
  @@ -0,0 +1,162 @@
  +/*
  + * arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -204,10 +198,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
  +      .init_machine   = tw5334_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
++++ b/arch/arm/mach-ixp4xx/tw5334-pci.c
  @@ -0,0 +1,69 @@
  +/*
  + * arch/arch/mach-ixp4xx/tw5334-pci.c
@@ -278,11 +270,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
  +}
  +
  +subsys_initcall(tw5334_pci_init);
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -42,7 +42,8 @@
          */
         if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                          machine_is_gateway7001() || machine_is_wg302v2() ||
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 fd8eb30380551b2fca60bce62e59df9c94151b88..0f9b5f43c38719e7be60b4f785bcd520ff53687a 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -25,6 +25,14 @@
           Avila Network Platform. For more information on this platform,
           see <file:Documentation/arm/IXP4xx>.
   
@@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
   config MACH_LOFT
       bool "Loft"
       depends on MACH_AVILA
-@@ -200,7 +208,7 @@ config CPU_IXP46X
+@@ -200,7 +208,7 @@
   
   config CPU_IXP43X
         bool
@@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
         default y
   
   config MACH_GTWX5715
-Index: linux-2.6.25.4/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      :=
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile
+@@ -7,6 +7,7 @@
   
   obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
   obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
@@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
   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 @@ obj-y        += common.o
+@@ -28,6 +29,7 @@
   
   obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
   obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
@@ -46,10 +42,8 @@ Index: linux-2.6.25.4/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.4/arch/arm/mach-ixp4xx/cambria-pci.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
++++ b/arch/arm/mach-ixp4xx/cambria-pci.c
  @@ -0,0 +1,74 @@
  +/*
  + * arch/arch/mach-ixp4xx/cambria-pci.c
@@ -125,10 +119,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
  +}
  +
  +subsys_initcall(cambria_pci_init);
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
++++ b/arch/arm/mach-ixp4xx/cambria-setup.c
  @@ -0,0 +1,444 @@
  +/*
  + * arch/arm/mach-ixp4xx/cambria-setup.c
@@ -574,10 +566,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
  +      .init_machine   = cambria_init,
  +MACHINE_END
  +#endif
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/hardware.h
++++ b/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 9b34b8a2b18f00226f969a66404e84ab57ed7175..394c3a18992b9ad71d7461b8e7bc7265865dc22f 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/drivers/net/arm/Kconfig
++++ b/drivers/net/arm/Kconfig
+@@ -47,3 +47,11 @@
         help
           This is a driver for the ethernet hardware included in EP93xx CPUs.
           Say Y if you are building a kernel for EP93xx based devices.
@@ -14,19 +12,15 @@ Index: linux-2.6.25.4/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.4/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
+--- a/drivers/net/arm/Makefile
++++ b/drivers/net/arm/Makefile
+@@ -9,3 +9,4 @@
   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.4/drivers/net/arm/ixp4xx_eth.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
  @@ -0,0 +1,1265 @@
  +/*
  + * Intel IXP4xx Ethernet driver for Linux
@@ -1293,11 +1287,9 @@ Index: linux-2.6.25.4/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.4/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
+--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -448,7 +448,9 @@
                 return -ETIMEDOUT;
         }
   
@@ -1307,7 +1299,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
         return 0;
   }
   
-@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo
+@@ -484,7 +486,9 @@
                 return -ETIMEDOUT;
         }
   
@@ -1317,11 +1309,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
         return 0;
   }
   
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
++++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+@@ -184,6 +184,8 @@
         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 c269caf9d38ad357cf5a11f454b0b71b8d3acdd6..a4c031aca141eae7cf52b143667daa252a268457 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -592,6 +592,8 @@
         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 510401768a286c3febd17334759988d84962d141..f0be25315a880834bdc3e29e1a607dc787b9793e 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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 {
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -165,14 +165,15 @@
         struct net_device *netdev;
         struct napi_struct napi;
         struct net_device_stats stat;
@@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   };
   
   /* NPE message structure */
-@@ -316,12 +317,13 @@ static void mdio_write(struct net_device
+@@ -316,12 +317,13 @@
         spin_unlock_irqrestore(&mdio_lock, flags);
   }
   
@@ -36,7 +34,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
         while (cycles < MAX_MII_RESET_RETRIES) {
                 if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
-@@ -335,12 +337,12 @@ static void phy_reset(struct net_device 
+@@ -335,12 +337,12 @@
                 cycles++;
         }
   
@@ -52,7 +50,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
                 __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
                              &port->regs->tx_control[0]);
         else
-@@ -348,7 +350,7 @@ static void eth_set_duplex(struct port *
+@@ -348,7 +350,7 @@
                              &port->regs->tx_control[0]);
   }
   
@@ -61,7 +59,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   static void phy_check_media(struct port *port, int init)
   {
         if (mii_check_media(&port->mii, 1, init))
-@@ -367,7 +369,63 @@ static void phy_check_media(struct port 
+@@ -367,7 +369,63 @@
                 }
         }
   }
@@ -125,7 +123,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
   static void mdio_thread(struct work_struct *work)
   {
-@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device *
+@@ -792,9 +850,12 @@
   
         if (!netif_running(dev))
                 return -EINVAL;
@@ -140,7 +138,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
         return err;
   }
   
-@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d
+@@ -947,7 +1008,8 @@
                 }
         }
   
@@ -150,7 +148,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
         memset(&msg, 0, sizeof(msg));
         msg.cmd = NPE_VLAN_SETRXQOSENTRY;
-@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device *
+@@ -1107,10 +1169,8 @@
                 printk(KERN_CRIT "%s: unable to disable loopback\n",
                        dev->name);
   
@@ -163,7 +161,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
         if (!ports_open)
                 qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device *
+@@ -1120,6 +1180,42 @@
         return 0;
   }
   
@@ -206,7 +204,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   static int __devinit eth_init_one(struct platform_device *pdev)
   {
         struct port *port;
-@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct
+@@ -1192,20 +1288,7 @@
         __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
         udelay(50);
   
@@ -228,11 +226,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
         INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
         return 0;
-Index: linux-2.6.25.4/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;
+--- a/include/asm-arm/arch-ixp4xx/platform.h
++++ b/include/asm-arm/arch-ixp4xx/platform.h
+@@ -95,12 +95,15 @@
   #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 b53bf5f79cdc4c821f7b22bba9a305f79b664b94..699763f518db14c3b08fcb03527e4e523eaac62b 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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 
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -322,8 +322,12 @@
         struct port *port = netdev_priv(dev);
         int phy_id = port->mii[idx].phy_id;
         int cycles = 0;
@@ -16,7 +14,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   
         while (cycles < MAX_MII_RESET_RETRIES) {
                 if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
-@@ -331,13 +335,23 @@ static void phy_reset(struct net_device 
+@@ -331,13 +335,23 @@
                         printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
                                dev->name, cycles);
   #endif
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 264a99ef4f4215211c1b425af4a4afd25b0c9ece..411e0cb428353acf42d89f48642f75ae6f04dbc3 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
++++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+@@ -575,8 +575,8 @@
                 for (i = 0; i < image->size; i++)
                         image->data[i] = swab32(image->data[i]);
   
@@ -13,7 +11,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
                           "IXP42x\n");
                 goto err;
         }
-@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c
+@@ -598,7 +598,7 @@
                   "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
                   (image->id >> 8) & 0xFF, image->id & 0xFF);
   
@@ -22,10 +20,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
                 if (!npe->id)
                         instr_size = NPE_A_42X_INSTR_SIZE;
                 else
-Index: linux-2.6.25.4/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
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
  @@ -32,6 +32,7 @@
   #include <linux/kernel.h>
   #include <linux/mii.h>
@@ -34,7 +30,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
   #include <asm/arch/npe.h>
   #include <asm/arch/qmgr.h>
   
-@@ -1338,12 +1339,16 @@ static struct platform_driver drv = {
+@@ -1338,12 +1339,16 @@
   
   static int __init eth_init_module(void)
   {
@@ -55,11 +51,9 @@ Index: linux-2.6.25.4/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.4/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
+--- a/include/asm-arm/arch-ixp4xx/cpu.h
++++ b/include/asm-arm/arch-ixp4xx/cpu.h
+@@ -34,6 +34,8 @@
         val &= ~IXP4XX_FEATURE_RESERVED;
         if (!cpu_is_ixp46x())
                 val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
@@ -68,10 +62,8 @@ Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h
   
         return val;
   }
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
++++ b/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 50683fdd58d9f87f9fdd2581b36fa8c1e069d5c8..86949c30bd89c39a8675e1beec7155bbac3842bf 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/drivers/net/wan/Kconfig
++++ b/drivers/net/wan/Kconfig
+@@ -338,6 +338,15 @@
   
           Say Y if your card supports this feature.
   
@@ -18,11 +16,9 @@ Index: linux-2.6.25.4/drivers/net/wan/Kconfig
   config DLCI
         tristate "Frame Relay DLCI support"
         ---help---
-Index: linux-2.6.25.4/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
+--- a/drivers/net/wan/Makefile
++++ b/drivers/net/wan/Makefile
+@@ -42,6 +42,7 @@
   obj-$(CONFIG_WANXL)           += wanxl.o
   obj-$(CONFIG_PCI200SYN)               += pci200syn.o
   obj-$(CONFIG_PC300TOO)                += pc300too.o
@@ -30,10 +26,8 @@ Index: linux-2.6.25.4/drivers/net/wan/Makefile
   
   clean-files := wanxlfw.inc
   $(obj)/wanxl.o:       $(obj)/wanxlfw.inc
-Index: linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c
++++ b/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 5849a7b1a3558347b3ee036b6caefe7f7273646f..165ca6a80b1cec64f373aedb4d52c52cfd1f334d 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/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
+--- a/drivers/i2c/chips/eeprom.c
++++ b/drivers/i2c/chips/eeprom.c
  @@ -33,6 +33,8 @@
   #include <linux/jiffies.h>
   #include <linux/i2c.h>
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
   
   /* Addresses to scan */
   static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
-@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[]
+@@ -41,26 +43,7 @@
   /* Insmod parameters */
   I2C_CLIENT_INSMOD_1(eeprom);
   
@@ -39,7 +37,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
   
   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 @@ static int eeprom_detect(struct i2c_adap
+@@ -197,6 +180,7 @@
         data->valid = 0;
         mutex_init(&data->update_lock);
         data->nature = UNKNOWN;
@@ -47,7 +45,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
   
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
-@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap
+@@ -224,6 +208,9 @@
         if (err)
                 goto exit_detach;
   
@@ -57,7 +55,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
         return 0;
   
   exit_detach:
-@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i
+@@ -249,6 +236,41 @@
         return 0;
   }
   
@@ -99,10 +97,8 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
   static int __init eeprom_init(void)
   {
         return i2c_add_driver(&eeprom_driver);
-Index: linux-2.6.25.4/include/linux/eeprom.h
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/include/linux/eeprom.h
++++ b/include/linux/eeprom.h
  @@ -0,0 +1,71 @@
  +#ifndef _LINUX_EEPROM_H
  +#define _LINUX_EEPROM_H
@@ -175,11 +171,9 @@ Index: linux-2.6.25.4/include/linux/eeprom.h
  +extern int unregister_eeprom_notifier(struct notifier_block *nb);
  +
  +#endif /* _LINUX_EEPROM_H */
-Index: linux-2.6.25.4/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
+--- a/include/linux/notifier.h
++++ b/include/linux/notifier.h
+@@ -248,5 +248,8 @@
   #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/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-2.6.25/295-latch_led_driver.patch

index 7733abc596f109c812a2ef8a884c2c73460fa797..0266aa253f8cf35f5314ebd29844df0654ae1442 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/295-latch_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/295-latch_led_driver.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/leds/Kconfig
-+++ linux-2.6.25.4/drivers/leds/Kconfig
-@@ -125,6 +125,12 @@ config LEDS_GPIO
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -125,6 +125,12 @@
           outputs. To be useful the particular board must have LEDs
           and they must be connected to the GPIO lines.
   
@@ -15,10 +13,8 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig
   config LEDS_CM_X270
         tristate "LED Support for the CM-X270 LEDs"
         depends on LEDS_CLASS && MACH_ARMCORE
-Index: linux-2.6.25.4/drivers/leds/leds-latch.c
-===================================================================
  --- /dev/null
-+++ linux-2.6.25.4/drivers/leds/leds-latch.c
++++ b/drivers/leds/leds-latch.c
  @@ -0,0 +1,141 @@
  +/*
  + * LEDs driver for Memory Latched Devices
@@ -161,11 +157,9 @@ Index: linux-2.6.25.4/drivers/leds/leds-latch.c
  +MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
  +MODULE_DESCRIPTION("Latch LED driver");
  +MODULE_LICENSE("GPL");
-Index: linux-2.6.25.4/drivers/leds/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/leds/Makefile
-+++ linux-2.6.25.4/drivers/leds/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_LEDS_H1940)             += leds-h1940.
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -19,6 +19,7 @@
   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
@@ -173,11 +167,9 @@ Index: linux-2.6.25.4/drivers/leds/Makefile
   obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
   obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
   obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
-Index: linux-2.6.25.4/include/linux/leds.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/leds.h
-+++ linux-2.6.25.4/include/linux/leds.h
-@@ -136,5 +136,18 @@ struct gpio_led_platform_data {
+--- a/include/linux/leds.h
++++ b/include/linux/leds.h
+@@ -136,5 +136,18 @@
         struct gpio_led *leds;
   };
   
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 26267c827b9d24ac492c8d7025f88f7c7d9a3695..c1c584c6121dcc7f1c61f7d204872a19914ec871 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -132,6 +132,31 @@
         .resource               = avila_pata_resources,
   };
   
@@ -34,7 +32,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   static struct platform_device *avila_devices[] __initdata = {
         &avila_i2c_gpio,
         &avila_flash,
-@@ -159,6 +184,8 @@ static void __init avila_init(void)
+@@ -159,6 +184,8 @@
   
         platform_device_register(&avila_pata);
   
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 1d154c66916047fd71f9126c7b325789c7b0f930..db25efbea60662401bb4bf9a9655473dd512d41f 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
  @@ -14,10 +14,18 @@
   #include <linux/kernel.h>
   #include <linux/init.h>
@@ -35,7 +33,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   static struct flash_platform_data avila_flash_data = {
         .map_name       = "cfi_probe",
         .width          = 2,
-@@ -163,10 +178,160 @@ static struct platform_device *avila_dev
+@@ -163,10 +178,160 @@
         &avila_uart
   };
   
@@ -196,7 +194,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
         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 @@ static void __init avila_init(void)
+@@ -184,9 +349,28 @@
   
         platform_device_register(&avila_pata);
   
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 09e0e237633219c84efddfeff7d972ad623c3b92..7a079f537a76c623d7bb5599bd3cf13406255b67 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
  @@ -26,6 +26,7 @@
   # include <linux/eeprom.h>
   #endif
@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   #include <linux/i2c-gpio.h>
   
   #include <asm/types.h>
-@@ -172,6 +173,72 @@ static struct platform_device avila_npec
+@@ -172,6 +173,72 @@
         .dev.platform_data      = &avila_npec_data,
   };
   
@@ -83,7 +81,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   static struct platform_device *avila_devices[] __initdata = {
         &avila_i2c_gpio,
         &avila_flash,
-@@ -182,6 +249,8 @@ static void __init avila_gw23xx_setup(vo
+@@ -182,6 +249,8 @@
   {
         platform_device_register(&avila_npeb_device);
         platform_device_register(&avila_npec_device);
@@ -92,7 +90,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   }
   
   #ifdef CONFIG_SENSORS_EEPROM
-@@ -189,6 +258,8 @@ static void __init avila_gw2342_setup(vo
+@@ -189,6 +258,8 @@
   {
         platform_device_register(&avila_npeb_device);
         platform_device_register(&avila_npec_device);
@@ -101,7 +99,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   }
   
   static void __init avila_gw2345_setup(void)
-@@ -199,22 +270,30 @@ static void __init avila_gw2345_setup(vo
+@@ -199,22 +270,30 @@
   
         avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
         platform_device_register(&avila_npec_device);
@@ -132,7 +130,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   }
   
   static void __init avila_gw2355_setup(void)
-@@ -225,11 +304,29 @@ static void __init avila_gw2355_setup(vo
+@@ -225,11 +304,29 @@
   
         avila_npec_data.phy = 16;
         platform_device_register(&avila_npec_device);
@@ -162,10 +160,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   }
   
   static struct avila_board_info avila_boards[] __initdata = {
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/avila.h
++++ b/include/asm-arm/arch-ixp4xx/avila.h
  @@ -36,4 +36,6 @@
   #define AVILA_PCI_INTC_PIN    9
   #define AVILA_PCI_INTD_PIN    8
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 741c45965d5034de5e408f70df07a96e6e76dd27..53b8b632a6a823ad74124defbd40eba42e643bc0 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
-@@ -239,10 +239,28 @@ static struct platform_device avila_latc
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -239,10 +239,28 @@
         .dev.platform_data      = &avila_latch_leds_data,
   };
   
@@ -32,10 +30,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
   };
   
   static void __init avila_gw23xx_setup(void)
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/avila.h
++++ b/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 792acc0f3e2bc8f3f7dda7f8f8920aaccc85a02a..ece08fd171f83a78954ca0a433e75aab5d91d3af 100644 (file)
--- 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,8 +1,6 @@
-Index: linux-2.6.25.4/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
-@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -294,6 +294,7 @@
   
   static void __init avila_gw2347_setup(void)
   {
@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
         platform_device_register(&avila_npeb_device);
   
         avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo
+@@ -338,6 +339,7 @@
   
   static void __init avila_gw2357_setup(void)
   {
@@ -18,11 +16,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
         platform_device_register(&avila_npeb_device);
   
         avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-Index: linux-2.6.25.4/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 
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -348,6 +348,14 @@
                 return;
         }
   
@@ -37,11 +33,9 @@ Index: linux-2.6.25.4/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.4/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 {
+--- a/include/asm-arm/arch-ixp4xx/platform.h
++++ b/include/asm-arm/arch-ixp4xx/platform.h
+@@ -104,6 +104,8 @@
         u8 txreadyq;
         u8 hwaddr[6];
         u32 phy_mask;
diff --git a/target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch

index 4d26fa6ce729b9d29c0b78e299d7d2f525571a5e..688085291c7a80f452ec1c650fdecd532f2ddff4 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
++++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
  @@ -29,6 +29,8 @@
   #include <linux/serial_8250.h>
   #include <linux/slab.h>
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
   #include <asm/types.h>
   #include <asm/setup.h>
   #include <asm/memory.h>
-@@ -121,9 +123,41 @@ static struct platform_device gtwx5715_f
+@@ -121,9 +123,41 @@
         .resource       = &gtwx5715_flash_resource,
   };
   
diff --git a/target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch

index 2ae0f9af4c31212dbb228c5262f5ffe03dbb14d0..90f750e7a92579ebfa25922fb83925e4ff85b0f3 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
-@@ -154,10 +154,37 @@ static struct platform_device gtwx5715_s
+--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
++++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+@@ -154,10 +154,37 @@
         },
   };
   
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 9831cd515bb4890b29965370bc81af8f3e5425ba..7dae291497e69a648cf223917c250dbe4e156e07 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/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
+--- a/arch/arm/common/dmabounce.c
++++ b/arch/arm/common/dmabounce.c
+@@ -117,6 +117,10 @@
         } else if (size <= device_info->large.size) {
                 pool = &device_info->large;
         } else {
@@ -13,11 +11,9 @@ Index: linux-2.6.25.4/arch/arm/common/dmabounce.c
                 pool = NULL;
         }
   
-Index: linux-2.6.25.4/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
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -236,6 +236,11 @@
         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 74bc9ae42bf55308dca2f904a7a97f2eff623ed0..2e2023002bebd78e9ecaf974137325a9e4e4c363 100644 (file)
--- 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,5 @@
-Index: linux-2.6.25.4/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
+--- a/include/asm-arm/arch-ixp4xx/avila.h
++++ b/include/asm-arm/arch-ixp4xx/avila.h
  @@ -25,7 +25,7 @@
   /*
    * AVILA PCI IRQs
author	Imre Kaloz <kaloz@openwrt.org>
	Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)
committer	Imre Kaloz <kaloz@openwrt.org>
	Fri, 30 May 2008 16:32:35 +0000 (16:32 +0000)
target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/295-latch_led_driver.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch		patch \| blob \| history
target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch		patch \| blob \| history