Merge branch 'linus' into x86/xsave

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 173febac6656..c67fecafff90 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
+#include <linux/fb.h>
 
 /* Notes on locking:
  *
@@ -45,6 +46,8 @@ struct lcd_ops {
         int (*get_contrast)(struct lcd_device *);
         /* Set LCD panel contrast */
         int (*set_contrast)(struct lcd_device *, int contrast);
+        /* Set LCD panel mode (resolutions ...) */
+        int (*set_mode)(struct lcd_device *, struct fb_videomode *);
         /* Check if given framebuffer device is the one LCD is bound to;
            return 0 if not, !=0 if it is. If NULL, lcd always matches the fb. */
         int (*check_fb)(struct lcd_device *, struct fb_info *);