linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / i810 / i810-i2c.c

diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index c1f7b49..e3c8b5f 100644 (file)
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -8,6 +8,7 @@
  *  License. See the file COPYING in the main directory of this archive for
  *  more details.
  */
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -209,7 +210,8 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
                }
        }
 
-       *out_edid = edid;
+        if (out_edid)
+                *out_edid = edid;
 
         return (edid) ? 0 : 1;
 }