[PATCH] fix compile error in imsttfb.c

Paul Mackerras (paulus@samba.org)
Sat, 7 Jul 2001 12:07:55 +1000 (EST)


As it currently stands, drivers/video/imsttfb.c will give a compile
error if FBCON_HAS_CFB32 is defined. This patch fixes that.

There used to be a declaration of `i' which was only used if
FBCON_HAS_CFB32 was defined. I suspect that somebody was compiling
without FBCON_HAS_CFB32 and saw an unused variable warning from gcc
and decided to take out the declaration. This patch will avoid that
warning.

Linus, please apply.

Paul.

diff -urN linux/drivers/video/imsttfb.c linuxppc_2_4/drivers/video/imsttfb.c
--- linux/drivers/video/imsttfb.c Thu Jul 5 14:46:16 2001
+++ linuxppc_2_4/drivers/video/imsttfb.c Thu Jul 5 10:58:09 2001
@@ -1278,10 +1278,11 @@
break;
#endif
#ifdef FBCON_HAS_CFB32
- case 32:
- i = (regno << 8) | regno;
+ case 32: {
+ int i = (regno << 8) | regno;
p->fbcon_cmap.cfb32[regno] = (i << 16) | i;
break;
+ }
#endif
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/