[Gc-linux-cvs] linux/include/linux fb.h,1.21,1.22

[Albert H. <he...@us...>]

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

Modified Files:
	fb.h 
Log Message:
Merged 2.6.19.


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- fb.h	17 Feb 2007 23:43:42 -0000	1.21
+++ fb.h	18 Feb 2007 22:56:04 -0000	1.22
@@ -2,6 +2,7 @@
 #define _LINUX_FB_H
 
 #include <asm/types.h>
+#include <linux/i2c.h>
 
 /* Definitions of frame buffers						*/
 
@@ -780,6 +781,7 @@
 	struct fb_ops *fbops;
 	struct device *device;
 	struct class_device *class_device; /* sysfs per device attrs */
+	int class_flag;                    /* private sysfs flags */
 #ifdef CONFIG_FB_TILEBLITTING
 	struct fb_tile_ops *tileops;    /* Tile Blitting */
 #endif
@@ -951,6 +953,7 @@
 				struct fb_monspecs *specs);
 extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
+extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
 
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34