aboutsummaryrefslogtreecommitdiff
path: root/include/video/edid.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-12-13 09:26:45 +0000
committerDavid Howells <dhowells@redhat.com>2011-12-13 09:26:45 +0000
commite9356f4da3ffba7ab826ec3ea5f31f414f5b2a95 (patch)
tree47a41838b271d4ccfa66ba4e97a2dcf4dabd04a2 /include/video/edid.h
parent87d2f5e39835b990d3c78d25144dc05b068f697e (diff)
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>
Diffstat (limited to 'include/video/edid.h')
-rw-r--r--include/video/edid.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/video/edid.h b/include/video/edid.h
index 928c342b33d..c5f19870491 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__ */