Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 1a056adb61c8..256966e9667d 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -12,6 +12,7 @@
 
 #include "radeonfb.h"
 #include <linux/backlight.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
@@ -134,6 +135,7 @@ static struct backlight_ops radeon_bl_data = {
 
 void radeonfb_bl_init(struct radeonfb_info *rinfo)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
         struct radeon_bl_privdata *pdata;
         char name[12];
@@ -155,7 +157,10 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
         snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
 
-        bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, rinfo->info->dev, pdata,
+                                       &radeon_bl_data, &props);
         if (IS_ERR(bd)) {
                 rinfo->info->bl_dev = NULL;
                 printk("radeonfb: Backlight registration failed\n");
@@ -175,9 +180,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         pdata->negative = pdata->negative ||
-                machine_is_compatible("PowerBook4,3") ||
-                machine_is_compatible("PowerBook6,3") ||
-                machine_is_compatible("PowerBook6,5");
+                of_machine_is_compatible("PowerBook4,3") ||
+                of_machine_is_compatible("PowerBook6,3") ||
+                of_machine_is_compatible("PowerBook6,5");
 #endif
 
         rinfo->info->bl_dev = bd;
@@ -185,7 +190,6 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
                  63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,
                 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);