linux/ixp4xx: sync 2.6.36 patches to 2.6.36-rc6

[openwrt.git] / target / linux / ixp4xx / patches-2.6.35 / 295-latch_led_driver.patch

diff --git a/target/linux/ixp4xx/patches-2.6.35/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-2.6.35/295-latch_led_driver.patch
index 0468c95..1dc2690 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.35/295-latch_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/295-latch_led_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -157,6 +157,13 @@ config LEDS_LP3944
+@@ -176,6 +176,13 @@ config LEDS_LP3944
          To compile this driver as a module, choose M here: the
          module will be called leds-lp3944.
  
@@ -13,10 +13,10 @@
 +
  config LEDS_CLEVO_MAIL
        tristate "Mail LED on Clevo notebook"
-       depends on LEDS_CLASS && X86 && SERIO_I8042 && DMI
+       depends on X86 && SERIO_I8042 && DMI
 --- /dev/null
 +++ b/drivers/leds/leds-latch.c
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,150 @@
 +/*
 + * LEDs driver for Memory Latched Devices
 + *
@@ -36,6 +36,7 @@
 +#include <linux/workqueue.h>
 +#include <asm/io.h>
 +#include <linux/spinlock.h>
++#include <linux/slab.h>
 +
 +static unsigned int mem_keep = 0xFF;
 +static spinlock_t mem_lock;
@@ -166,10 +167,9 @@
 +
 +MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
 +MODULE_DESCRIPTION("Latch LED driver");
-+MODULE_LICENSE("GPL");
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_RAQ)                += leds-c
+@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_COBALT_RAQ)                += leds-c
  obj-$(CONFIG_LEDS_SUNFIRE)            += leds-sunfire.o
  obj-$(CONFIG_LEDS_PCA9532)            += leds-pca9532.o
  obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
@@ -179,7 +179,7 @@
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
-@@ -161,5 +161,19 @@ struct gpio_led_platform_data {
+@@ -165,5 +165,19 @@ struct gpio_led_platform_data {
                                        unsigned long *delay_off);
  };