[kernel] update to 2.6.26.5 and 2.6.25.17

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

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 e35ddbe334879362734b052b9b6870df461bc98e..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.24.2/arch/arm/mach-ixp4xx/avila-setup.c
-===================================================================
---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/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,9 +33,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
  static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,
-@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma
-       t->hdr.size = 0;
- }
+@@ -163,10 +178,160 @@
+       &avila_uart
+ };
  
 +static void __init avila_gw23xx_setup(void)
 +{
@@ -196,7 +194,7 @@ Index: linux-2.6.24.2/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;
-@@ -213,9 +378,28 @@ static void __init avila_init(void)
+@@ -184,9 +349,28 @@
  
        platform_device_register(&avila_pata);