Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Convert from struct class_device to struct device
  leds: leds-gpio for ngw100
  leds: Add warning printks in error paths
  leds: Fix trigger unregister_simple if register_simple fails
  leds: Use menuconfig objects II - LED
  leds: Teach leds-gpio to handle timer-unsafe GPIOs
  leds: Add generic GPIO LED driver

diff --combined include/linux/leds.h
index 494bed7,dc1178f..4211750
--- 1/include/linux/leds.h
--- 2/include/linux/leds.h
+++ b/include/linux/leds.h
@@@ -13,9 -13,9 +13,8 @@@
  #define __LINUX_LEDS_H_INCLUDED
  
  #include <linux/list.h>
 -#include <linux/spinlock.h>
  
  struct device;
- struct class_device;
  /*
   * LED Core
   */
@@@ -37,7 -37,7 +36,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 +108,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 */