Merge commit 'v2.6.27-rc3' into x86/prototypes

[linux-2.6-omap-h63xx.git] / drivers / video / backlight / hp680_bl.c

diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index 0899fccbd5709f203d10ecdd1c5b2b60215606cd..6fa0b9d5559ac712c033eb0508fd21ca9a4dc08e 100644 (file)
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -18,7 +18,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 #include <asm/hp6xx.h>
 #include <asm/hd64461.h>
 
@@ -125,8 +125,8 @@ static int hp680bl_remove(struct platform_device *pdev)
 {
        struct backlight_device *bd = platform_get_drvdata(pdev);
 
-       hp680bl_data.brightness = 0;
-       hp680bl_data.power = 0;
+       bd->props.brightness = 0;
+       bd->props.power = 0;
        hp680bl_send_intensity(bd);
 
        backlight_device_unregister(bd);