Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

Pull fbdev fixes from Florian Tobias Schandinat:

 - two fixes for s3c-fb by Jingoo Han (including a fix for a potential
   division by zero)

 - a couple of randconfig fixes by Arnd Bergmann

 - a cleanup for bfin_adv7393fb by Emil Goode

* tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
  video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
  video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
  drivers/tosa: driver needs I2C and SPI to compile
  drivers/savagefb: use mdelay instead of udelay
  video/console: automatically select a font
  video/ili9320: do not mark exported functions __devexit
  drivers/video: use correct __devexit_p annotation
  video: bfin_adv7393fb: Convert to kstrtouint_from_user

8 files changed, 34 insertions, 16 deletions

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index fa2b03750316..2979292650d6 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -88,7 +88,7 @@ config LCD_PLATFORM
 
 config LCD_TOSA
         tristate "Sharp SL-6000 LCD Driver"
-        depends on SPI && MACH_TOSA
+        depends on I2C && SPI && MACH_TOSA
         help
           If you have an Sharp SL-6000 Zaurus say Y to enable a driver
           for its LCD.
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 6c9399341bcf..9327cd1b3143 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -263,7 +263,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
 EXPORT_SYMBOL_GPL(ili9320_probe_spi);
 
-int __devexit ili9320_remove(struct ili9320 *ili)
+int ili9320_remove(struct ili9320 *ili)
 {
         ili9320_power(ili, FB_BLANK_POWERDOWN);
 
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 33ea874c87d2..9bdd4b0c18c8 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -353,18 +353,16 @@ adv7393_read_proc(char *page, char **start, off_t off,
 
 static int
 adv7393_write_proc(struct file *file, const char __user * buffer,
-                   unsigned long count, void *data)
+                   size_t count, void *data)
 {
         struct adv7393fb_device *fbdev = data;
-        char line[8];
         unsigned int val;
         int ret;
 
-        ret = copy_from_user(line, buffer, count);
+        ret = kstrtouint_from_user(buffer, count, 0, &val);
         if (ret)
                 return -EFAULT;
 
-        val = simple_strtoul(line, NULL, 0);
         adv7393_write(fbdev->client, val >> 8, val & 0xff);
 
         return count;
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index 377dde3d5bfc..c95b417d0d41 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
 
 static struct platform_driver broadsheetfb_driver = {
         .probe  = broadsheetfb_probe,
-        .remove = broadsheetfb_remove,
+        .remove = __devexit_p(broadsheetfb_remove),
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "broadsheetfb",
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index c2d11fef114b..e2c96d01d8f5 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -224,5 +224,19 @@ config FONT_10x18
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
           If other fonts are too big or too small for you, say Y, otherwise say N.
 
+config FONT_AUTOSELECT
+        def_bool y
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
+        depends on !FONT_8x8
+        depends on !FONT_6x11
+        depends on !FONT_7x14
+        depends on !FONT_PEARL_8x8
+        depends on !FONT_ACORN_8x8
+        depends on !FONT_MINI_4x6
+        depends on !FONT_SUN8x16
+        depends on !FONT_SUN12x22
+        depends on !FONT_10x18
+        select FONT_8x16
+
 endmenu
 
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index ab0a8e527333..85e4f44bfa61 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -1045,7 +1045,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
 
 static struct platform_driver mbxfb_driver = {
         .probe = mbxfb_probe,
-        .remove = mbxfb_remove,
+        .remove = __devexit_p(mbxfb_remove),
         .suspend = mbxfb_suspend,
         .resume = mbxfb_resume,
         .driver = {
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 5f9d8e69029e..ea7b661e7229 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -361,7 +361,7 @@ static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
         result = (unsigned int)tmp / 1000;
 
         dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
-                pixclk, clk, result, clk / result);
+                pixclk, clk, result, result ? clk / result : clk);
 
         return result;
 }
@@ -1348,8 +1348,14 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
         writel(0, regs + VIDOSD_A(win, sfb->variant));
         writel(0, regs + VIDOSD_B(win, sfb->variant));
         writel(0, regs + VIDOSD_C(win, sfb->variant));
-        reg = readl(regs + SHADOWCON);
-        writel(reg & ~SHADOWCON_WINx_PROTECT(win), regs + SHADOWCON);
+
+        if (sfb->variant.has_shadowcon) {
+                reg = readl(sfb->regs + SHADOWCON);
+                reg &= ~(SHADOWCON_WINx_PROTECT(win) |
+                        SHADOWCON_CHx_ENABLE(win) |
+                        SHADOWCON_CHx_LOCAL_ENABLE(win));
+                writel(reg, sfb->regs + SHADOWCON);
+        }
 }
 
 static int __devinit s3c_fb_probe(struct platform_device *pdev)
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index cee7803a0a1c..f3d3b9ce4751 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1351,7 +1351,7 @@ static void savagefb_set_par_int(struct savagefb_par  *par, struct savage_reg *r
         /* following part not present in X11 driver */
         cr67 = vga_in8(0x3d5, par) & 0xf;
         vga_out8(0x3d5, 0x50 | cr67, par);
-        udelay(10000);
+        mdelay(10);
         vga_out8(0x3d4, 0x67, par);
         /* end of part */
         vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
@@ -1904,11 +1904,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x66, par);
         cr66 = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr66 | 0x02, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x66, par);
         vga_out8(0x3d5, cr66 & ~0x02, par);     /* clear reset flag */
-        udelay(10000);
+        mdelay(10);
 
 
         /*
@@ -1918,11 +1918,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x3f, par);
         cr3f = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr3f | 0x08, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x3f, par);
         vga_out8(0x3d5, cr3f & ~0x08, par);     /* clear reset flags */
-        udelay(10000);
+        mdelay(10);
 
         /* Savage ramdac speeds */
         par->numClocks = 4;