diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 20:19:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 20:19:46 +0200 |
| commit | 2fe83b3ad12d43799af5f3156886eca443a88bac (patch) | |
| tree | 1f09c2f0013f4742106f7b1732da6fdc45b18d39 /drivers/video/nvidia | |
| parent | Merge branch 'audit.b39' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | leds: cr_bllcd.c: build fix (diff) | |
| download | linux-2fe83b3ad12d43799af5f3156886eca443a88bac.tar.xz linux-2fe83b3ad12d43799af5f3156886eca443a88bac.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:
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.c | 2 |
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, static int nvidia_bl_update_status(struct backlight_device *bd) { - struct nvidia_par *par = class_get_devdata(&bd->class_dev); + struct nvidia_par *par = bl_get_data(bd); u32 tmp_pcrt, tmp_pmc, fpcontrol; int level; |