diff --git a/[refs] b/[refs]
index a047273def33..12c30ba079b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87d2f5e39835b990d3c78d25144dc05b068f697e
+refs/heads/master: e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95
diff --git a/trunk/include/video/edid.h b/trunk/include/video/edid.h
index 928c342b33d6..c5f198704912 100644
--- a/trunk/include/video/edid.h
+++ b/trunk/include/video/edid.h
@@ -1,16 +1,14 @@
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
-#if !defined(__KERNEL__) || defined(CONFIG_X86)
-
 struct edid_info {
 	unsigned char dummy[128];
 };
 
 #ifdef __KERNEL__
+#ifdef CONFIG_X86
 extern struct edid_info edid_info;
-#endif /* __KERNEL__ */
-
+#endif
 #endif
 
 #endif /* __linux_video_edid_h__ */