diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 11:34:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 11:34:55 -0700 |
| commit | cad719d86e9dbd06634eaba6401e022c8101d6b2 (patch) | |
| tree | ee0aa444e817e5cd29a9dea58dc36d0f3c65a50d /drivers/mfd | |
| parent | 3ddab4788d4980b1b3dc324fdd105adab3812418 (diff) | |
| parent | 67e67df8da723debf24f7763605776891203e8d5 (diff) | |
| download | blackbird-op-linux-cad719d86e9dbd06634eaba6401e022c8101d6b2.tar.gz blackbird-op-linux-cad719d86e9dbd06634eaba6401e022c8101d6b2.zip | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
gta02: Use pcf50633 backlight driver instead of platform backlight driver.
backlight: pcf50633: Register a pcf50633-backlight device in pcf50633 core driver.
backlight: Add pcf50633 backlight driver
backlight: 88pm860x_bl: fix error handling in pm860x_backlight_probe
backlight: max8925_bl: Fix error handling path
backlight: l4f00242t03: fix error handling in l4f00242t03_probe
backlight: add S6E63M0 AMOLED LCD Panel driver
backlight: adp8860: add support for ADP8861 & ADP8863
backlight: mbp_nvidia_bl - Fix DMI_SYS_VENDOR for MacBook1,1
backlight: Add Cirrus EP93xx backlight driver
backlight: l4f00242t03: Fix regulators handling code in remove function
backlight: fix adp8860_bl build errors
backlight: new driver for the ADP8860 backlight parts
backlight: 88pm860x_bl - potential memory leak
backlight: mbp_nvidia_bl - add support for older MacBookPro and MacBook 6,1.
backlight: Kconfig cleanup
backlight: backlight_device_register() return ERR_PTR()
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/pcf50633-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 63a614d696c1..dc95ddb708f1 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -620,6 +620,9 @@ static int __devinit pcf50633_probe(struct i2c_client *client, &pcf->mbc_pdev); pcf50633_client_dev_register(pcf, "pcf50633-adc", &pcf->adc_pdev); + pcf50633_client_dev_register(pcf, "pcf50633-backlight", + &pcf->bl_pdev); + for (i = 0; i < PCF50633_NUM_REGULATORS; i++) { struct platform_device *pdev; |
