X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fvideo%2Fedid.h;h=928c342b33d65040be5d2bfd958447d21074e92f;hb=c465a76af658b443075d6efee1c3131257643020;hp=f6a42d6c2e2d6e22daade1d3680cc1a088f26d26;hpb=28e4b224955cbe30275b2a7842e729023a4f4b03;p=linux-2.6-omap-h63xx.git diff --git a/include/video/edid.h b/include/video/edid.h index f6a42d6c2e2..928c342b33d 100644 --- a/include/video/edid.h +++ b/include/video/edid.h @@ -1,17 +1,16 @@ #ifndef __linux_video_edid_h__ #define __linux_video_edid_h__ -#ifdef __KERNEL__ - +#if !defined(__KERNEL__) || defined(CONFIG_X86) -#ifdef CONFIG_X86 struct edid_info { unsigned char dummy[128]; }; +#ifdef __KERNEL__ extern struct edid_info edid_info; -#endif /* CONFIG_X86 */ - #endif /* __KERNEL__ */ +#endif + #endif /* __linux_video_edid_h__ */