[PATCH] fbdev: Fix crashes in various fbdev's blank routines

[linux-2.6-omap-h63xx.git] / drivers / video / nvidia / nv_i2c.c

diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index bd9eca05e146d515a06d1c2c3e8e814d48c71ff8..19eef3a090232854860ad993365993dc7e5f68f6 100644 (file)
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -10,7 +10,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -218,8 +217,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
                }
        }
 
-       if (out_edid)
-               *out_edid = edid;
+       *out_edid = edid;
 
        return (edid) ? 0 : 1;
 }