Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3

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

diff --git a/include/video/edid.h b/include/video/edid.h
index f6a42d6..c5f1987 100644 (file)
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,17 +1,14 @@
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
-#ifdef __KERNEL__
-
-
-#ifdef CONFIG_X86
 struct edid_info {
        unsigned char dummy[128];
 };
 
+#ifdef __KERNEL__
+#ifdef CONFIG_X86
 extern struct edid_info edid_info;
-#endif /* CONFIG_X86 */
-
-#endif /* __KERNEL__ */
+#endif
+#endif
 
 #endif /* __linux_video_edid_h__ */