[kernel] net/usb: only package hso for 2.6.26

[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 1d154c6..db25efb 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>
 @@ -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,
  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
  };
  
        &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;
        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);
  
  
        platform_device_register(&avila_pata);