patch-2.1.44 linux/include/linux/console_struct.h

• Lines: 28
• Date: Mon Jul 7 16:02:33 1997
• Orig file: v2.1.43/linux/include/linux/console_struct.h
• Orig date: Mon Jun 16 16:36:00 1997

diff -u --recursive --new-file v2.1.43/linux/include/linux/console_struct.h linux/include/linux/console_struct.h
@@ -4,6 +4,8 @@
  * Data structure and defines shared between console.c, vga.c and tga.c
  */
 
+#include <linux/config.h>
+
 #define NPAR 16
 
 struct vc_data {
@@ -17,12 +19,17 @@
 	unsigned char	vc_halfcolor;		/* Colour for half intensity mode */
 	unsigned long	vc_origin;		/* Used for EGA/VGA fast scroll	*/
 	unsigned long	vc_scr_end;		/* Used for EGA/VGA fast scroll	*/
-	unsigned long	vc_pos;
 	unsigned long	vc_x,vc_y;
 	unsigned long	vc_top,vc_bottom;
 	unsigned long	vc_state;
 	unsigned long	vc_npar,vc_par[NPAR];
+#ifdef CONFIG_FB_CONSOLE
+	unsigned short	*vc_video_mem_start;	/* Start of video RAM		*/
+	unsigned short	*vc_pos;
+#else
+	unsigned long	vc_pos;
 	unsigned long	vc_video_mem_start;	/* Start of video RAM		*/
+#endif
 	unsigned long	vc_video_mem_end;	/* End of video RAM (sort of)	*/
 	unsigned long	vc_saved_x;
 	unsigned long	vc_saved_y;