diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 14:24:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 14:24:59 -0800 |
| commit | ea882c2ece7c68462a3734c71c60e2572e528fe7 (patch) | |
| tree | 39fc3c731034492db5a7f13e68290403b1353280 /include/video/edid.h | |
| parent | 8e8b180a5f1b237345f6e2d960bcceb8b6bc3793 (diff) | |
| parent | b889fcf63cb62e7fdb7816565e28f44dbe4a76a5 (diff) | |
Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers
Pull fbdev UAPI disintegration from David Howells:
"You'll be glad to here that the end is nigh for the UAPI patches.
Only the fbdev/framebuffer piece remains now that the SCSI stuff has
gone in.
Here are the UAPI disintegration bits for the fbdev drivers. It
appears that Florian hasn't had time to deal with my patch, but back
in December he did say he didn't mind if I pushed it forward."
Yay. No more uapi movement. And hopefully no more big header file
cleanups coming up either, it just tends to be very painful.
* tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate include/video
Diffstat (limited to 'include/video/edid.h')
| -rw-r--r-- | include/video/edid.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/video/edid.h b/include/video/edid.h index c5f19870491..0cb8b2a92b7 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,14 +1,9 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -struct edid_info { - unsigned char dummy[128]; -}; +#include <uapi/video/edid.h> -#ifdef __KERNEL__ #ifdef CONFIG_X86 extern struct edid_info edid_info; #endif -#endif - #endif /* __linux_video_edid_h__ */ |