Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c

1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 494bed7c2fc1..dc1178f6184b 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -13,9 +13,9 @@
 #define __LINUX_LEDS_H_INCLUDED
 
 #include <linux/list.h>
+#include <linux/spinlock.h>
 
 struct device;
-struct class_device;
 /*
  * LED Core
  */
@@ -37,7 +37,7 @@ struct led_classdev {
         void            (*brightness_set)(struct led_classdev *led_cdev,
                                           enum led_brightness brightness);
 
-        struct class_device     *class_dev;
+        struct device           *dev;
         struct list_head         node;                  /* LED Device list */
         char                    *default_trigger;       /* Trigger to use */
 
@@ -109,4 +109,18 @@ extern void ledtrig_ide_activity(void);
 #define ledtrig_ide_activity() do {} while(0)
 #endif
 
+/* For the leds-gpio driver */
+struct gpio_led {
+        const char *name;
+        char *default_trigger;
+        unsigned        gpio;
+        u8              active_low;
+};
+
+struct gpio_led_platform_data {
+        int             num_leds;
+        struct gpio_led *leds;
+};
+
+
 #endif          /* __LINUX_LEDS_H_INCLUDED */