Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 714187b..ecfbcc0 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -400,8 +400,6 @@ struct fb_tile_ops {
 #define FBINFO_HWACCEL_YPAN            0x2000 /* optional */
 #define FBINFO_HWACCEL_YWRAP           0x4000 /* optional */
 
-#define FBINFO_MISC_USEREVENT          0x10000 /* event request
-                                                 from userspace */
 #define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */
 
 /* A driver may set this flag to indicate that it does want a set_par to be