Jelajahi Sumber

UAPI: Fix nested __KERNEL__ guards in video/edid.h

Fix nested __KERNEL__ guards in video/edid.h to make parsing easier.

Signed-off-by: David Howells <dhowells@redhat.com>
David Howells 13 tahun lalu
induk
melakukan
e9356f4da3
1 mengubah file dengan 2 tambahan dan 4 penghapusan
  1. 2 4
      include/video/edid.h

+ 2 - 4
include/video/edid.h

@@ -1,16 +1,14 @@
 #ifndef __linux_video_edid_h__
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 #define __linux_video_edid_h__
 
 
-#if !defined(__KERNEL__) || defined(CONFIG_X86)
-
 struct edid_info {
 struct edid_info {
 	unsigned char dummy[128];
 	unsigned char dummy[128];
 };
 };
 
 
 #ifdef __KERNEL__
 #ifdef __KERNEL__
+#ifdef CONFIG_X86
 extern struct edid_info edid_info;
 extern struct edid_info edid_info;
-#endif /* __KERNEL__ */
-
+#endif
 #endif
 #endif
 
 
 #endif /* __linux_video_edid_h__ */
 #endif /* __linux_video_edid_h__ */