[kernel] update to 2.6.26.3 and 2.6.25.16

[openwrt.git] / target / linux / adm5120 / patches / 203-gpio_leds_brightness.patch

diff --git a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
index 1c53192bc3b94e81dd9fee48de61ee2b81a48668..06394da295b935286299fec7722cb2dc6ac52e28 100644 (file)
--- a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
+++ b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/drivers/leds/leds-gpio.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/leds/leds-gpio.c
-+++ linux-2.6.24.7/drivers/leds/leds-gpio.c
-@@ -41,13 +41,17 @@ static void gpio_led_set(struct led_clas
+--- a/drivers/leds/leds-gpio.c
++++ b/drivers/leds/leds-gpio.c
+@@ -41,13 +41,17 @@
                container_of(led_cdev, struct gpio_led_data, cdev);
        int level;
  
@@ -25,5 +23,5 @@ Index: linux-2.6.24.7/drivers/leds/leds-gpio.c
 +              break;
 +      }
  
-       /* setting GPIOs with I2C/etc requires a preemptible task context */
-       if (led_dat->can_sleep) {
+       /* Setting GPIOs with I2C/etc requires a task context, and we don't
+        * seem to have a reliable way to know if we're already in one; so