diff options
| author |   David Howells <dhowells@redhat.com> | 2011-12-13 09:26:45 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-12-13 09:26:45 +0000 |
| commit | e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95 (patch) | |
| tree | 47a41838b271d4ccfa66ba4e97a2dcf4dabd04a2 /include/video/edid.h | |
| parent | UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter (diff) | |
| download | linux-dev-e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95.tar.xz linux-dev-e9356f4da3ffba7ab826ec3ea5f31f414f5b2a95.zip | |
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.h | 6 |
1 files changed, 2 insertions, 4 deletions
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__ */ |