Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 18:22:01 +0000 (11:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 18:22:01 +0000 (11:22 -0700)
* '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

1  2 
include/linux/leds.h

index 494bed7c2fc12f5133504daa7b4a2cc0e3b4b326,dc1178f6184b1480da56a11eeba46bc0f2cc2b14..421175092ee2495eca787af009dc20f834b6a9f6
@@@ -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
   */