[adm5120] resync 2.6.28 config

[openwrt.git] / target / linux / ixp4xx / patches-2.6.27 / 301-avila_led.patch

diff --git a/target/linux/ixp4xx/patches-2.6.27/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.27/301-avila_led.patch
index 9bedec6..2bd0e16 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.27/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/301-avila_led.patch
@@ -1,14 +1,14 @@
 --- 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
+@@ -24,6 +24,7 @@
+ #include <linux/i2c.h>
+ #include <linux/i2c/at24.h>
  
 +#include <linux/leds.h>
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>
-@@ -172,6 +173,72 @@
+@@ -170,6 +171,72 @@ static struct platform_device avila_npec
        .dev.platform_data      = &avila_npec_data,
  };
  
@@ -81,7 +81,7 @@
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,
-@@ -182,6 +249,8 @@
+@@ -180,12 +247,16 @@ static void __init avila_gw23xx_setup(vo
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
@@ -89,8 +89,7 @@
 +      platform_device_register(&avila_gpio_leds_device);
  }
  
- #ifdef CONFIG_SENSORS_EEPROM
-@@ -189,6 +258,8 @@
+ static void __init avila_gw2342_setup(void)
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
@@ -99,7 +98,7 @@
  }
  
  static void __init avila_gw2345_setup(void)
-@@ -199,22 +270,30 @@
+@@ -196,22 +267,30 @@ static void __init avila_gw2345_setup(vo
  
        avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
        platform_device_register(&avila_npec_device);
@@ -130,7 +129,7 @@
  }
  
  static void __init avila_gw2355_setup(void)
-@@ -225,11 +304,29 @@
+@@ -222,11 +301,29 @@ static void __init avila_gw2355_setup(vo
  
        avila_npec_data.phy = 16;
        platform_device_register(&avila_npec_device);