Skip to contentSkip to conversation

fbcon.c

PATCH New Rolf Eike Beer 1 participant 1 message Oct 10, 2001 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbcon.c

This patch avoids some warnings during compile. The block where the vars are used is ifdefed out so here they are ifdefed out too. The patch is against 2.4.11 but should apply to earlier 2.4 too, I remember this warnings from other 2.4.x.

Eike Beer

usr/src/linux/drivers/video/fbcon.c Wed Oct 10 14:05:20 2001 renamed from usr/src/linux/drivers/video/fbcon.c.orig Wed Oct 10 13:41:57 2001 +0 -0
@@ -2125,12 +2125,16 @@
 {
     struct display *p = &fb_display[fg_console]; /* draw to vt in foreground 

*/

     int depth = p->var.bits_per_pixel;
-    int line = p->next_line;
     unsigned char *fb = p->screen_base;
     unsigned char *logo;
-    unsigned char *dst, *src;
-    int i, j, n, x1, y1, x;
+    int i, j, n, x;
     int logo_depth, done = 0;
+#if defined(CONFIG_FBCON_CFB16) || defined(CONFIG_FBCON_CFB24) || \
+    defined(CONFIG_FBCON_CFB32) || defined(CONFIG_FB_SBUS)
+    int line = p->next_line;
+    unsigned char *dst, *src;
+    int x1, y1;

+#endif

     /* Return if the frame buffer is not mapped */
     if (!fb)