Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[sfrench/cifs-2.6.git] / include / video / edid.h

diff --git a/include/video/edid.h b/include/video/edid.h
index f6a42d6c2e2d6e22daade1d3680cc1a088f26d26..928c342b33d65040be5d2bfd958447d21074e92f 100644 (file)
--- a/include/video/edid.h
+++ b/include/video/edid.h
@@ -1,17 +1,16 @@
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
-#ifdef __KERNEL__
-
+#if !defined(__KERNEL__) || defined(CONFIG_X86)
 
-#ifdef CONFIG_X86
 struct edid_info {
        unsigned char dummy[128];
 };
 
+#ifdef __KERNEL__
 extern struct edid_info edid_info;
-#endif /* CONFIG_X86 */
-
 #endif /* __KERNEL__ */
 
+#endif
+
 #endif /* __linux_video_edid_h__ */