[x86] sync kernel config

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 300-avila_fetch_mac.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch
index 463383f..7303399 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch
@@ -1,6 +1,7 @@
-diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/build_dir/linux-ixp4xx_generic/linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c
---- linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-04 01:28:24.134925761 +0100
-+++ ../../../../trunk/build_dir/linux-ixp4xx_generic/linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c        2008-01-04 01:23:27.874042817 +0100
+Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
+===================================================================
+--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c

 @@ -14,10 +14,18 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
 @@ -14,10 +14,18 @@
  #include <linux/kernel.h>
  #include <linux/init.h>


@@ -20,7 +21,7 @@ diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>

-@@ -194,9 +202,48 @@
+@@ -194,9 +202,48 @@ static void __init avila_fixup(struct ma

      t->hdr.size = 0;
  }
  
      t->hdr.size = 0;
  }
  


@@ -69,4 +70,3 @@ diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/
  
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =
  
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =

-