refresh patch

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 204-npe_driver_ixp43x_support.patch

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 264a99e..411e0cb 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)