diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 11:22:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 11:22:01 -0700 |
| commit | d7f5e3df3574c6e38b99f5fe22f15540b2b9811d (patch) | |
| tree | 75fc060628490d4bc78dd3b92635b8437b6e4290 /include/linux | |
| parent | 2fe83b3ad12d43799af5f3156886eca443a88bac (diff) | |
| parent | f8a7c6fe14f556ca8eeddce258cb21392d0c3a2f (diff) | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/leds.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index 494bed7c2fc..421175092ee 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -15,7 +15,6 @@ #include <linux/list.h> struct device; -struct class_device; /* * LED Core */ @@ -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 +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 */ |