The patch titled uvesafb: fix warnings about unused variables on non-x86 has been added to the -mm tree. Its filename is uvesafb-fix-warnings-about-unused-variables-on-non-x86.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uvesafb: fix warnings about unused variables on non-x86 From: Frank Lichtenheld <frank@xxxxxxxxxxxxxx> Variables that are only used in #ifdef CONFIG_X86 should also only be declared there. Signed-off-by: Frank Lichtenheld <frank@xxxxxxxxxxxxxx> Cc: Michal Januszewski <spock@xxxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/uvesafb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/video/uvesafb.c~uvesafb-fix-warnings-about-unused-variables-on-non-x86 drivers/video/uvesafb.c --- a/drivers/video/uvesafb.c~uvesafb-fix-warnings-about-unused-variables-on-non-x86 +++ a/drivers/video/uvesafb.c @@ -926,8 +926,10 @@ static int uvesafb_setpalette(struct uve int start, struct fb_info *info) { struct uvesafb_ktask *task; +#ifdef CONFIG_X86 struct uvesafb_par *par = info->par; int i = par->mode_idx; +#endif int err = 0; /* @@ -1103,11 +1105,11 @@ static int uvesafb_pan_display(struct fb static int uvesafb_blank(int blank, struct fb_info *info) { - struct uvesafb_par *par = info->par; struct uvesafb_ktask *task; int err = 1; - #ifdef CONFIG_X86 + struct uvesafb_par *par = info->par; + if (par->vbe_ib.capabilities & VBE_CAP_VGACOMPAT) { int loop = 10000; u8 seq = 0, crtc17 = 0; _ Patches currently in -mm which might be from frank@xxxxxxxxxxxxxx are uvesafb-fix-warnings-about-unused-variables-on-non-x86.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