diff --git a/[refs] b/[refs] index 38df9913e9a1..a810c9b79e8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 607c50d429371797f198ffc34afb239eadd1c655 +refs/heads/master: 265da78afd52b9a01d76d99556e828a6c30f1ac9 diff --git a/trunk/include/drm/Kbuild b/trunk/include/drm/Kbuild index a5c0e10fd47d..1e38a19d68f6 100644 --- a/trunk/include/drm/Kbuild +++ b/trunk/include/drm/Kbuild @@ -2,6 +2,7 @@ header-y += drm.h header-y += drm_fourcc.h header-y += drm_mode.h header-y += drm_sarea.h +header-y += exynos_drm.h header-y += i810_drm.h header-y += i915_drm.h header-y += mga_drm.h diff --git a/trunk/include/drm/exynos_drm.h b/trunk/include/drm/exynos_drm.h index 308575ea7c00..1ed3aae893a5 100644 --- a/trunk/include/drm/exynos_drm.h +++ b/trunk/include/drm/exynos_drm.h @@ -97,6 +97,8 @@ struct drm_exynos_plane_set_zpos { #define DRM_IOCTL_EXYNOS_PLANE_SET_ZPOS DRM_IOWR(DRM_COMMAND_BASE + \ DRM_EXYNOS_PLANE_SET_ZPOS, struct drm_exynos_plane_set_zpos) +#ifdef __KERNEL__ + /** * A structure for lcd panel information. * @@ -152,4 +154,5 @@ struct exynos_drm_hdmi_pdata { unsigned int bpp; }; -#endif +#endif /* __KERNEL__ */ +#endif /* _EXYNOS_DRM_H_ */