29 files changed, 169 insertions, 153 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index f447734b09b4..57b1d44acbfe 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -748,6 +748,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo,
                 fbcon_del_cursor_timer(oldinfo);
                 kfree(ops->cursor_state.mask);
                 kfree(ops->cursor_data);
+                kfree(ops->cursor_src);
                 kfree(ops->fontbuffer);
                 kfree(oldinfo->fbcon_par);
                 oldinfo->fbcon_par = NULL;
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e1f47272fdea..59c98bfd5a8a 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -360,6 +360,7 @@ config FB_CYBER2000_DDC
 config FB_CYBER2000_I2C
         bool "CyberPro 2000/2010/5000 I2C support"
         depends on FB_CYBER2000 && I2C && ARCH_NETWINDER
+        depends on I2C=y || FB_CYBER2000=m
         select I2C_ALGOBIT
         help
           Enable support for the I2C video decoder interface on the
@@ -966,6 +967,7 @@ config FB_S1D13XXX
 config FB_ATMEL
         tristate "AT91/AT32 LCD Controller support"
         depends on FB && HAVE_FB_ATMEL
+        select FB_BACKLIGHT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -1971,6 +1973,7 @@ config FB_W100
 config FB_SH_MOBILE_LCDC
         tristate "SuperH Mobile LCDC framebuffer support"
         depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
+        depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM
         select FB_SYS_FILLRECT
         select FB_SYS_COPYAREA
         select FB_SYS_IMAGEBLIT
@@ -1993,7 +1996,7 @@ config FB_SH_MOBILE_HDMI
 
 config FB_TMIO
         tristate "Toshiba Mobile IO FrameBuffer support"
-        depends on FB && MFD_CORE
+        depends on FB && (MFD_TMIO || COMPILE_TEST)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -2062,7 +2065,7 @@ config FB_S3C2410_DEBUG
           through sysfs
 
 config FB_NUC900
-        bool "NUC900 LCD framebuffer support"
+        tristate "NUC900 LCD framebuffer support"
         depends on FB && ARCH_W90X900
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -2169,7 +2172,7 @@ config FB_XILINX
 
 config FB_GOLDFISH
         tristate "Goldfish Framebuffer"
-        depends on FB && HAS_DMA
+        depends on FB && HAS_DMA && (GOLDFISH || COMPILE_TEST)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -2295,6 +2298,7 @@ endchoice
 config FB_MB862XX_I2C
         bool "Support I2C bus on MB862XX GDC"
         depends on FB_MB862XX && I2C
+        depends on FB_MB862XX=m || I2C=y
         default y
         help
           Selecting this option adds Coral-P(A)/Lime GDC I2C bus adapter
@@ -2332,6 +2336,7 @@ config FB_MX3
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
+        select BACKLIGHT_CLASS_DEVICE
         default y
         help
           This is a framebuffer device for the i.MX31 LCD Controller. So
diff --git a/drivers/video/fbdev/bf54x-lq043fb.c b/drivers/video/fbdev/bf54x-lq043fb.c
index e2c42ad8515a..adbef542c998 100644
--- a/drivers/video/fbdev/bf54x-lq043fb.c
+++ b/drivers/video/fbdev/bf54x-lq043fb.c
@@ -717,8 +717,6 @@ static int bfin_bf54x_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_bf54x_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct fb_info *fbinfo = platform_get_drvdata(pdev);
-
         bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() & ~EPPI_EN);
         disable_dma(CH_EPPI0);
         bfin_write_EPPI0_STATUS(0xFFFF);
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index b6d5008f361f..b5e85f6c1c26 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
                         image->dx += image->width + 8;
                 }
         } else if (rotate == FB_ROTATE_UD) {
-                for (x = 0; x < num && image->dx >= 0; x++) {
+                for (x = 0; x < num; x++) {
                         info->fbops->fb_imageblit(info, image);
                         image->dx -= image->width + 8;
                 }
@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
                         image->dy += image->height + 8;
                 }
         } else if (rotate == FB_ROTATE_CCW) {
-                for (x = 0; x < num && image->dy >= 0; x++) {
+                for (x = 0; x < num; x++) {
                         info->fbops->fb_imageblit(info, image);
                         image->dy -= image->height + 8;
                 }
@@ -674,6 +674,7 @@ int fb_show_logo(struct fb_info *info, int rotate)
 int fb_prepare_logo(struct fb_info *info, int rotate) { return 0; }
 int fb_show_logo(struct fb_info *info, int rotate) { return 0; }
 #endif /* CONFIG_LOGO */
+EXPORT_SYMBOL(fb_prepare_logo);
 EXPORT_SYMBOL(fb_show_logo);