aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 14:19:46 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 14:19:46 -0400
commit2fe83b3ad12d43799af5f3156886eca443a88bac (patch)
tree1f09c2f0013f4742106f7b1732da6fdc45b18d39 /drivers/video/nvidia
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/nvidia')
-rw-r--r--drivers/video/nvidia/nv_backlight.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 43f62d8ee41d..443e3c85a9a0 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -50,7 +50,7 @@ static int nvidia_bl_get_level_brightness(struct nvidia_par *par,
50 50
51static int nvidia_bl_update_status(struct backlight_device *bd) 51static int nvidia_bl_update_status(struct backlight_device *bd)
52{ 52{
53 struct nvidia_par *par = class_get_devdata(&bd->class_dev); 53 struct nvidia_par *par = bl_get_data(bd);
54 u32 tmp_pcrt, tmp_pmc, fpcontrol; 54 u32 tmp_pcrt, tmp_pmc, fpcontrol;
55 int level; 55 int level;
56 56