diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-13 19:08:06 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-13 19:08:06 -0400 |
commit | e3643b77de143c5548ec93abd8aa68f4123295ea (patch) | |
tree | 41981957bc93e8211fe55cd04b7cac47e74bc770 /include/drm/Kbuild | |
parent | 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (diff) | |
parent | 44b2cef5ae6da48523fa634230ca66107110a7dd (diff) |
Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
* 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
PM / devfreq: update the name of EXYNOS clock registers that were omitted
PM / devfreq: update the name of EXYNOS clock register
ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
ARM: EXYNOS: use static declaration on regarding clock
ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
(includes an update to v3.3-rc6)
Diffstat (limited to 'include/drm/Kbuild')
-rw-r--r-- | include/drm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/Kbuild b/include/drm/Kbuild index a5c0e10fd47d..1e38a19d68f6 100644 --- a/include/drm/Kbuild +++ b/include/drm/Kbuild | |||
@@ -2,6 +2,7 @@ header-y += drm.h | |||
2 | header-y += drm_fourcc.h | 2 | header-y += drm_fourcc.h |
3 | header-y += drm_mode.h | 3 | header-y += drm_mode.h |
4 | header-y += drm_sarea.h | 4 | header-y += drm_sarea.h |
5 | header-y += exynos_drm.h | ||
5 | header-y += i810_drm.h | 6 | header-y += i810_drm.h |
6 | header-y += i915_drm.h | 7 | header-y += i915_drm.h |
7 | header-y += mga_drm.h | 8 | header-y += mga_drm.h |