diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 14:52:40 -0500 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 14:52:40 -0500 |
| commit | b20f86625de738658c74f2ecfe4050416d2252cc (patch) | |
| tree | b84216b70bd923409217834a953f983700e39eda /include/video | |
| parent | 9f1065032ceb7e86c7c9f16bb86518857e88a172 (diff) | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
Merge commit 'v3.3-rc1' into fbdev-next
Diffstat (limited to 'include/video')
| -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 @@ | |||
| 1 | #ifndef __linux_video_edid_h__ | 1 | #ifndef __linux_video_edid_h__ |
| 2 | #define __linux_video_edid_h__ | 2 | #define __linux_video_edid_h__ |
| 3 | 3 | ||
| 4 | #if !defined(__KERNEL__) || defined(CONFIG_X86) | ||
| 5 | |||
| 6 | struct edid_info { | 4 | struct edid_info { |
| 7 | unsigned char dummy[128]; | 5 | unsigned char dummy[128]; |
| 8 | }; | 6 | }; |
| 9 | 7 | ||
| 10 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
| 9 | #ifdef CONFIG_X86 | ||
| 11 | extern struct edid_info edid_info; | 10 | extern struct edid_info edid_info; |
| 12 | #endif /* __KERNEL__ */ | 11 | #endif |
| 13 | |||
| 14 | #endif | 12 | #endif |
| 15 | 13 | ||
| 16 | #endif /* __linux_video_edid_h__ */ | 14 | #endif /* __linux_video_edid_h__ */ |