The patch titled rivafb: use constants instead of magic values has been added to the -mm tree. Its filename is rivafb-use-constants-instead-of-magic-values.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: rivafb: use constants instead of magic values From: Guido Guenther <agx@xxxxxxxxxxx> use (MIN/MAX)_LEVEL and FB_(UN)BLANK instead of the values they are defined to Signed-off-by: Guido Guenther <agx@xxxxxxxxxxx> Signed-off-by: Antonino Daplas <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/video/riva/fbdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/video/riva/fbdev.c~rivafb-use-constants-instead-of-magic-values drivers/video/riva/fbdev.c --- a/drivers/video/riva/fbdev.c~rivafb-use-constants-instead-of-magic-values +++ a/drivers/video/riva/fbdev.c @@ -389,8 +389,8 @@ static void riva_bl_init(struct riva_par mutex_lock(&info->bl_mutex); info->bl_dev = bd; fb_bl_default_curve(info, 0, - 0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL, - 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL); + MIN_LEVEL * FB_BACKLIGHT_MAX / MAX_LEVEL, + FB_BACKLIGHT_MAX); mutex_unlock(&info->bl_mutex); up(&bd->sem); @@ -780,7 +780,7 @@ static void riva_load_video_mode(struct NVTRACE_ENTER(); /* time to calculate */ - rivafb_blank(1, info); + rivafb_blank(FB_BLANK_NORMAL, info); bpp = info->var.bits_per_pixel; if (bpp == 16 && info->var.green.length == 5) @@ -913,7 +913,7 @@ static void riva_load_video_mode(struct par->current_state = newmode; riva_load_state(par, &par->current_state); par->riva.LockUnlock(&par->riva, 0); /* important for HW cursor */ - rivafb_blank(0, info); + rivafb_blank(FB_BLANK_UNBLANK, info); NVTRACE_LEAVE(); } _ Patches currently in -mm which might be from agx@xxxxxxxxxxx are rivafb-nvidiafb-race-between-register_framebuffer-and-_bl_init.patch rivafb-use-constants-instead-of-magic-values.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html