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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5f014d3764c8..04ea697f72bf 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;
 }