Merge branch 'acpi-misc'

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

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 850f79e..ecfbcc0 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -124,7 +124,7 @@ struct fb_cursor_user {
  * Register/unregister for framebuffer events
  */
 
-/*     The resolution of the passed in fb_info about to change */ 
+/*     The resolution of the passed in fb_info about to change */
 #define FB_EVENT_MODE_CHANGE           0x01
 
 #ifdef CONFIG_GUMSTIX_AM200EPD
@@ -457,12 +457,12 @@ struct fb_info {
 
 #if IS_ENABLED(CONFIG_FB_BACKLIGHT)
        /* assigned backlight device */
-       /* set before framebuffer registration, 
+       /* set before framebuffer registration,
           remove after unregister */
        struct backlight_device *bl_dev;
 
        /* Backlight level curve */
-       struct mutex bl_curve_mutex;    
+       struct mutex bl_curve_mutex;
        u8 bl_curve[FB_BACKLIGHT_LEVELS];
 #endif
 #ifdef CONFIG_FB_DEFERRED_IO
@@ -481,8 +481,8 @@ struct fb_info {
                char __iomem *screen_base;      /* Virtual address */
                char *screen_buffer;
        };
-       unsigned long screen_size;      /* Amount of ioremapped VRAM or 0 */ 
-       void *pseudo_palette;           /* Fake palette of 16 colors */ 
+       unsigned long screen_size;      /* Amount of ioremapped VRAM or 0 */
+       void *pseudo_palette;           /* Fake palette of 16 colors */
 #define FBINFO_STATE_RUNNING   0
 #define FBINFO_STATE_SUSPENDED 1
        u32 state;                      /* Hardware state i.e suspend */
@@ -585,11 +585,11 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
      *  `Generic' versions of the frame buffer device operations
      */
 
-extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var); 
-extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var); 
+extern int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var);
+extern int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var);
 extern int fb_blank(struct fb_info *info, int blank);
-extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect); 
-extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area); 
+extern void cfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
+extern void cfb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
 extern void cfb_imageblit(struct fb_info *info, const struct fb_image *image);
 /*
  * Drawing operations where framebuffer is in system RAM