From: James Simmons Update the frambuffer drivers to the backlight_device_registers changes. Signed-off-by: James Simmons Cc: Luming Yu Cc: "Antonino A. Daplas" Cc: "Brown, Len" Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/video/aty/aty128fb.c | 6 +++--- drivers/video/aty/atyfb_base.c | 6 +++--- drivers/video/aty/radeon_backlight.c | 2 +- drivers/video/nvidia/nv_backlight.c | 2 +- drivers/video/riva/fbdev.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff -puN drivers/video/aty/aty128fb.c~fbdev-update-after-backlight-argument-change drivers/video/aty/aty128fb.c --- a/drivers/video/aty/aty128fb.c~fbdev-update-after-backlight-argument-change +++ a/drivers/video/aty/aty128fb.c @@ -1829,7 +1829,7 @@ static void aty128_bl_init(struct aty128 snprintf(name, sizeof(name), "aty128bl%d", info->node); - bd = backlight_device_register(name, par, &aty128_bl_data); + bd = backlight_device_register(name, info->dev, par, &aty128_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; printk(KERN_WARNING "aty128: Backlight registration failed\n"); @@ -2210,7 +2210,7 @@ static int aty128fb_blank(int blank, str return 0; #ifdef CONFIG_FB_ATY128_BACKLIGHT - if (machine_is(powermac) && blank) + if (blank) aty128_bl_set_power(fb, FB_BLANK_POWERDOWN); #endif @@ -2229,7 +2229,7 @@ static int aty128fb_blank(int blank, str } #ifdef CONFIG_FB_ATY128_BACKLIGHT - if (machine_is(powermac) && !blank) + if (blank) aty128_bl_set_power(fb, FB_BLANK_UNBLANK); #endif diff -puN drivers/video/aty/atyfb_base.c~fbdev-update-after-backlight-argument-change drivers/video/aty/atyfb_base.c --- a/drivers/video/aty/atyfb_base.c~fbdev-update-after-backlight-argument-change +++ a/drivers/video/aty/atyfb_base.c @@ -2221,7 +2221,7 @@ static void aty_bl_init(struct atyfb_par snprintf(name, sizeof(name), "atybl%d", info->node); - bd = backlight_device_register(name, par, &aty_bl_data); + bd = backlight_device_register(name, info->dev, par, &aty_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; printk(KERN_WARNING "aty: Backlight registration failed\n"); @@ -2814,7 +2814,7 @@ static int atyfb_blank(int blank, struct return 0; #ifdef CONFIG_FB_ATY_BACKLIGHT - if (machine_is(powermac) && blank > FB_BLANK_NORMAL) + if (blank > FB_BLANK_NORMAL) aty_bl_set_power(info, FB_BLANK_POWERDOWN); #elif defined(CONFIG_FB_ATY_GENERIC_LCD) if (par->lcd_table && blank > FB_BLANK_NORMAL && @@ -2846,7 +2846,7 @@ static int atyfb_blank(int blank, struct aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); #ifdef CONFIG_FB_ATY_BACKLIGHT - if (machine_is(powermac) && blank <= FB_BLANK_NORMAL) + if (blank <= FB_BLANK_NORMAL) aty_bl_set_power(info, FB_BLANK_UNBLANK); #elif defined(CONFIG_FB_ATY_GENERIC_LCD) if (par->lcd_table && blank <= FB_BLANK_NORMAL && diff -puN drivers/video/aty/radeon_backlight.c~fbdev-update-after-backlight-argument-change drivers/video/aty/radeon_backlight.c --- a/drivers/video/aty/radeon_backlight.c~fbdev-update-after-backlight-argument-change +++ a/drivers/video/aty/radeon_backlight.c @@ -163,7 +163,7 @@ void radeonfb_bl_init(struct radeonfb_in snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node); - bd = backlight_device_register(name, pdata, &radeon_bl_data); + bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data); if (IS_ERR(bd)) { rinfo->info->bl_dev = NULL; printk("radeonfb: Backlight registration failed\n"); diff -puN drivers/video/nvidia/nv_backlight.c~fbdev-update-after-backlight-argument-change drivers/video/nvidia/nv_backlight.c --- a/drivers/video/nvidia/nv_backlight.c~fbdev-update-after-backlight-argument-change +++ a/drivers/video/nvidia/nv_backlight.c @@ -141,7 +141,7 @@ void nvidia_bl_init(struct nvidia_par *p snprintf(name, sizeof(name), "nvidiabl%d", info->node); - bd = backlight_device_register(name, par, &nvidia_bl_data); + bd = backlight_device_register(name, info->dev, par, &nvidia_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; printk(KERN_WARNING "nvidia: Backlight registration failed\n"); diff -puN drivers/video/riva/fbdev.c~fbdev-update-after-backlight-argument-change drivers/video/riva/fbdev.c --- a/drivers/video/riva/fbdev.c~fbdev-update-after-backlight-argument-change +++ a/drivers/video/riva/fbdev.c @@ -383,7 +383,7 @@ static void riva_bl_init(struct riva_par snprintf(name, sizeof(name), "rivabl%d", info->node); - bd = backlight_device_register(name, par, &riva_bl_data); + bd = backlight_device_register(name, info->dev, par, &riva_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; printk(KERN_WARNING "riva: Backlight registration failed\n"); _