diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 11:34:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 11:34:20 -0700 |
| commit | 3ddab4788d4980b1b3dc324fdd105adab3812418 (patch) | |
| tree | 91b25590723d2a81ecd4d42753412cb8c4897bf0 /drivers/mfd | |
| parent | d1e0fe252e1c410164127b3000613afeaf47e49f (diff) | |
| parent | a7cca8aec9d08231207503e4823e7b47bfa7e596 (diff) | |
| download | linux-3ddab4788d4980b1b3dc324fdd105adab3812418.tar.gz linux-3ddab4788d4980b1b3dc324fdd105adab3812418.tar.bz2 linux-3ddab4788d4980b1b3dc324fdd105adab3812418.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: Add mx31moboard MC13783 led support
leds: Add mc13783 LED support
leds: leds-ss4200: fix led_classdev_unregister twice in error handling
leds: leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
leds: led-class: set permissions on max_brightness file to 0444
leds: leds-gpio: Change blink_set callback to be able to turn off blinking
leds: Add LED driver for the Soekris net5501 board
leds: 88pm860x - fix checking in probe function
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mc13783-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c index 1f68ecadddc2..fecf38a4f025 100644 --- a/drivers/mfd/mc13783-core.c +++ b/drivers/mfd/mc13783-core.c @@ -679,6 +679,10 @@ err_revision: if (pdata->flags & MC13783_USE_TOUCHSCREEN) mc13783_add_subdevice(mc13783, "mc13783-ts"); + if (pdata->flags & MC13783_USE_LED) + mc13783_add_subdevice_pdata(mc13783, "mc13783-led", + pdata->leds, sizeof(*pdata->leds)); + return 0; } |