Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16634/include/linux
Modified Files:
fb.h
Log Message:
Merge 2.6.11
Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fb.h 6 Jan 2005 20:22:17 -0000 1.11
+++ fb.h 3 Mar 2005 21:12:53 -0000 1.12
@@ -491,7 +491,8 @@
#define FB_EVENT_GET_CONSOLE_MAP 0x06
/* set console to framebuffer mapping */
#define FB_EVENT_SET_CONSOLE_MAP 0x07
-
+/* A display blank is requested */
+#define FB_EVENT_BLANK 0x08
struct fb_event {
struct fb_info *info;
@@ -586,6 +587,10 @@
int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg, struct fb_info *info);
+ /* Handle 32bit compat ioctl (optional) */
+ int (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg,
+ struct fb_info *info);
+
/* perform fb specific mmap */
int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
};
@@ -693,7 +698,7 @@
#define FBINFO_HWACCEL_YPAN 0x2000 /* optional */
#define FBINFO_HWACCEL_YWRAP 0x4000 /* optional */
-#define FBINFO_MISC_MODECHANGEUSER 0x10000 /* mode change request
+#define FBINFO_MISC_USEREVENT 0x10000 /* event request
from userspace */
#define FBINFO_MISC_MODESWITCH 0x20000 /* mode switch */
#define FBINFO_MISC_MODESWITCHLATE 0x40000 /* init hardware later */
@@ -866,7 +871,6 @@
/* drivers/video/modedb.c */
#define VESA_MODEDB_SIZE 34
-extern const struct fb_videomode vesa_modes[];
extern void fb_var_to_videomode(struct fb_videomode *mode,
struct fb_var_screeninfo *var);
extern void fb_videomode_to_var(struct fb_var_screeninfo *var,
@@ -911,6 +915,8 @@
u32 flag;
};
+extern const struct fb_videomode vesa_modes[];
+
struct fb_modelist {
struct list_head list;
struct fb_videomode mode;
|
