summaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/cr_bllcd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 11:19:46 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 11:19:46 -0700
commit2fe83b3ad12d43799af5f3156886eca443a88bac (patch)
tree1f09c2f0013f4742106f7b1732da6fdc45b18d39 /drivers/video/backlight/cr_bllcd.c
parentdd6ccfe64dad4ea498392805b477308abef43a4c (diff)
parentce8c47cf88af4da2ff429933c07f203a55d5d0a1 (diff)
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: leds: cr_bllcd.c: build fix backlight: Convert from struct class_device to struct device backlight: Fix order of Kconfig entries
Diffstat (limited to 'drivers/video/backlight/cr_bllcd.c')
-rw-r--r--drivers/video/backlight/cr_bllcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 1b3f6586bc9..b7904da51b2 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -202,7 +202,7 @@ static int cr_backlight_probe(struct platform_device *pdev)
}
crp->cr_lcd_device = lcd_device_register("cr-lcd",
- &pdev->dev,
+ &pdev->dev, NULL,
&cr_lcd_ops);
if (IS_ERR(crp->cr_lcd_device)) {