diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:07:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:07:32 -0700 |
| commit | ea541686d8454efac4f2b5c0767affb12d4b6a52 (patch) | |
| tree | ef0812fcc3e07c067042add6388146b3485c793e /include | |
| parent | 0d876c6a96e2cabf8632e8066b617d9c2dec9518 (diff) | |
| parent | 601a1b92ed3ce0025f7bec6fc591cceaef8d9d69 (diff) | |
| download | linux-ea541686d8454efac4f2b5c0767affb12d4b6a52.tar.gz linux-ea541686d8454efac4f2b5c0767affb12d4b6a52.tar.bz2 linux-ea541686d8454efac4f2b5c0767affb12d4b6a52.zip | |
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/acpi: Fix merge fallout from acpi_driver_data change
leds: Simplify logic in leds-ams-delta
leds: Fix trigger registration race
leds: Fix leds-class.c comment
leds: Add driver for HP harddisk protection LEDs
leds: leds-pca955x - Mark pca955x_led_set() static
leds: Remove uneeded leds-cm-x270 driver
leds: Remove uneeded strlen calls
leds: Add leds-wrap default-trigger
leds: Make default trigger fields const
leds: Add backlight LED trigger
leds: da903x: Add support for LEDs found on DA9030/DA9034
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/leds.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index d41ccb56146a..d3a73f5a48c3 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -123,7 +123,7 @@ extern void ledtrig_ide_activity(void); */ struct led_info { const char *name; - char *default_trigger; + const char *default_trigger; int flags; }; @@ -135,7 +135,7 @@ struct led_platform_data { /* For the leds-gpio driver */ struct gpio_led { const char *name; - char *default_trigger; + const char *default_trigger; unsigned gpio; u8 active_low; }; |