summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.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/acpi/video.c
parentdd6ccfe64dad4ea498392805b477308abef43a4c (diff)
parentce8c47cf88af4da2ff429933c07f203a55d5d0a1 (diff)
downloadop-kernel-dev-2fe83b3ad12d43799af5f3156886eca443a88bac.zip
op-kernel-dev-2fe83b3ad12d43799af5f3156886eca443a88bac.tar.gz
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/acpi/video.c')
-rw-r--r--drivers/acpi/video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5f014d3..04ea697 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -284,7 +284,7 @@ static int acpi_video_get_brightness(struct backlight_device *bd)
{
unsigned long cur_level;
struct acpi_video_device *vd =
- (struct acpi_video_device *)class_get_devdata(&bd->class_dev);
+ (struct acpi_video_device *)bl_get_data(bd);
acpi_video_device_lcd_get_level_current(vd, &cur_level);
return (int) cur_level;
}
@@ -293,7 +293,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd)
{
int request_level = bd->props.brightness;
struct acpi_video_device *vd =
- (struct acpi_video_device *)class_get_devdata(&bd->class_dev);
+ (struct acpi_video_device *)bl_get_data(bd);
acpi_video_device_lcd_set_level(vd, request_level);
return 0;
}
OpenPOWER on IntegriCloud