Merge with /home/shaggy/git/linus-clean/

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index ee25b9e8db60..47a6b12bc968 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2374,10 +2374,9 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
         } while (   rinfo->fb_base == 0 &&
                   ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) );
 
-        if (rinfo->fb_base)
-                memset_io(rinfo->fb_base, 0, rinfo->mapped_vram);
-        else {
-                printk (KERN_ERR "radeonfb (%s): cannot map FB\n", pci_name(rinfo->pdev));
+        if (rinfo->fb_base == NULL) {
+                printk (KERN_ERR "radeonfb (%s): cannot map FB\n",
+                        pci_name(rinfo->pdev));
                 ret = -EIO;
                 goto err_unmap_rom;
         }
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index c78a2c5961d3..277d733c6d00 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -241,7 +241,7 @@ static ssize_t show_virtual(struct class_device *class_device, char *buf)
         struct fb_info *fb_info =
                 (struct fb_info *)class_get_devdata(class_device);
         return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
-                        fb_info->var.xres_virtual);
+                        fb_info->var.yres_virtual);
 }
 
 static ssize_t store_cmap(struct class_device *class_device, const char * buf,
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index de5a0f383600..2fc71081f7e7 100644
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -387,3 +387,4 @@ int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
 }
 EXPORT_SYMBOL(mac_find_mode);
 
+MODULE_LICENSE("GPL");