From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 22 Jul 2007 18:22:01 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
X-Git-Tag: v2.6.23-rc1~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d7f5e3df3574c6e38b99f5fe22f15540b2b9811d;p=linux-2.6-omap-h63xx.git

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
---

d7f5e3df3574c6e38b99f5fe22f15540b2b9811d
diff --cc include/linux/leds.h
index 494bed7c2fc,dc1178f6184..421175092ee
--- a/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
   */