[Gc-linux-cvs] linux/include/linux fb.h,1.4,1.5

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31080/include/linux

Modified Files:
	fb.h 
Log Message:
Merged 2.6.7


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fb.h	24 Apr 2004 18:31:45 -0000	1.4
+++ fb.h	16 Jun 2004 17:30:46 -0000	1.5
@@ -516,7 +516,6 @@
 	struct fb_cmap cmap;		/* Current cmap */
 	struct fb_ops *fbops;
 	char *screen_base;		/* Virtual address */
-	struct vc_data *display_fg;	/* Console visible on this display */
 	int currcon;			/* Current VC. */
 	void *pseudo_palette;		/* Fake palette of 16 colors */ 
 #define FBINFO_STATE_RUNNING	0