Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 0bf2190928d0..72d68b3dc478 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1223,12 +1223,6 @@ static int __devinit install_fb(struct fb_info *info)
                 return -EINVAL;
         }
 
-        if (fsl_diu_set_par(info)) {
-                printk(KERN_ERR "fb_set_par failed");
-                fb_dealloc_cmap(&info->cmap);
-                return -EINVAL;
-        }
-
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR "register_framebuffer failed");
                 unmap_video_memory(info);