Automatic merge with /usr/src/ntfs-2.6.git.

5 files changed, 17 insertions, 22 deletions

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index cacd88cc84ab..b6fe30c3ad62 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -111,15 +111,15 @@ static int au1100fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
 void au1100_nocursor(struct display *p, int mode, int xx, int yy){};
 
 static struct fb_ops au1100fb_ops = {
-        owner:          THIS_MODULE,
-        fb_get_fix:     fbgen_get_fix,
-        fb_get_var:     fbgen_get_var,
-        fb_set_var:     fbgen_set_var,
-        fb_get_cmap:    fbgen_get_cmap,
-        fb_set_cmap:    fbgen_set_cmap,
-        fb_pan_display: fbgen_pan_display,
-        fb_ioctl:       au1100fb_ioctl,
-        fb_mmap:        au1100fb_mmap,
+        .owner          = THIS_MODULE,
+        .fb_get_fix     = fbgen_get_fix,
+        .fb_get_var     = fbgen_get_var,
+        .fb_set_var     = fbgen_set_var,
+        .fb_get_cmap    = fbgen_get_cmap,
+        .fb_set_cmap    = fbgen_set_cmap,
+        .fb_pan_display = fbgen_pan_display,
+        .fb_ioctl       = au1100fb_ioctl,
+        .fb_mmap        = au1100fb_mmap,
 };
 
 static void au1100_detect(void)
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index e4b91a4b936c..cbff98337aa6 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -156,7 +156,6 @@ config FONT_6x11
 config FONT_7x14
         bool "console 7x14 font (not supported by all drivers)" if FONTS
         depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC32 && !SPARC64 && !FONTS
         help
           Console font with characters just a bit smaller than the default.
           If the standard 8x16 font is a little too big for you, say Y.
@@ -197,8 +196,8 @@ config FONT_SUN12x22
           standard font is unreadable for you, say Y, otherwise say N.
 
 config FONT_10x18
-        bool "console 10x18 font (not supported by all drivers)"
-        depends on FONTS
+        bool "console 10x18 font (not supported by all drivers)" if FONTS
+        depends on FRAMEBUFFER_CONSOLE
         help
           This is a high resolution console font for machines with very
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 277d733c6d00..7dfbf39b4ed3 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -228,8 +228,6 @@ static ssize_t store_virtual(struct class_device *class_device,
         if (last - buf >= count)
                 return -EINVAL;
         var.yres_virtual = simple_strtoul(last, &last, 0);
-        printk(KERN_ERR "fb: xres %d yres %d\n", var.xres_virtual,
-               var.yres_virtual);
 
         if ((err = activate(fb_info, &var)))
                 return err;
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 76fd3a519b8a..a18dd024fc86 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -197,10 +197,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
         DBG(__FUNCTION__)
 
         hw->SEQ[0] = 0x00;
-        if (fwidth == 9)
-                hw->SEQ[1] = 0x00;
-        else
-                hw->SEQ[1] = 0x01;      /* or 0x09 */
+        hw->SEQ[1] = 0x01;      /* or 0x09 */
         hw->SEQ[2] = 0x0F;      /* bitplanes */
         hw->SEQ[3] = 0x00;
         hw->SEQ[4] = 0x0E;
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index f3069b01e248..9ed1a931dd31 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -389,10 +389,11 @@ static int __init vesafb_probe(struct device *device)
                 unsigned int temp_size = size_total;
                 /* Find the largest power-of-two */
                 while (temp_size & (temp_size - 1))
-                        temp_size &= (temp_size - 1);
-                        
-                /* Try and find a power of two to add */
-                while (temp_size && mtrr_add(vesafb_fix.smem_start, temp_size, MTRR_TYPE_WRCOMB, 1)==-EINVAL) {
+                        temp_size &= (temp_size - 1);
+
+                /* Try and find a power of two to add */
+                while (temp_size > PAGE_SIZE &&
+                        mtrr_add(vesafb_fix.smem_start, temp_size, MTRR_TYPE_WRCOMB, 1)==-EINVAL) {
                         temp_size >>= 1;
                 }
         }