Merge git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

[cascardo/linux.git] / include / video / edid.h

diff --git a/include/video/edid.h b/include/video/edid.h
index 928c342..c5f1987 100644 (file)
--- a/include/video/edid.h
+++ b/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__ */