From: David Howells <dhowells@redhat.com>
Date: Tue, 13 Dec 2011 09:26:45 +0000 (+0000)
Subject: UAPI: Fix nested __KERNEL__ guards in video/edid.h
X-Git-Tag: v3.3-rc1~56^2~4
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95;p=cascardo%2Flinux.git

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>
---

diff --git a/include/video/edid.h b/include/video/edid.h
index 928c342b33d6..c5f198704912 100644
--- 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__ */