summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/gpu/drm/sti/Makefile
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-11 10:41:07 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-13 08:17:18 +0300
commite09b41010ba33a20a87472ee821fa407a5b8da36 (patch)
treed10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/gpu/drm/sti/Makefile
parentf93b97fd65072de626c074dbe099a1fff05ce060 (diff)
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page. During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/gpu/drm/sti/Makefile')
-rw-r--r--kernel/drivers/gpu/drm/sti/Makefile26
1 files changed, 11 insertions, 15 deletions
diff --git a/kernel/drivers/gpu/drm/sti/Makefile b/kernel/drivers/gpu/drm/sti/Makefile
index f0f1e4ee2..b8057620b 100644
--- a/kernel/drivers/gpu/drm/sti/Makefile
+++ b/kernel/drivers/gpu/drm/sti/Makefile
@@ -1,27 +1,23 @@
-sticompositor-y := \
- sti_layer.o \
+sti-drm-y := \
sti_mixer.o \
sti_gdp.o \
sti_vid.o \
sti_cursor.o \
sti_compositor.o \
- sti_drm_crtc.o \
- sti_drm_plane.o
-
-stihdmi-y := sti_hdmi.o \
+ sti_crtc.o \
+ sti_plane.o \
+ sti_crtc.o \
+ sti_plane.o \
+ sti_hdmi.o \
sti_hdmi_tx3g0c55phy.o \
sti_hdmi_tx3g4c28phy.o \
-
-stidvo-y := sti_dvo.o \
- sti_awg_utils.o
-
-obj-$(CONFIG_DRM_STI) = \
+ sti_dvo.o \
+ sti_awg_utils.o \
sti_vtg.o \
sti_vtac.o \
- stihdmi.o \
sti_hda.o \
sti_tvout.o \
- sticompositor.o \
sti_hqvdp.o \
- stidvo.o \
- sti_drm_drv.o
+ sti_drv.o
+
+obj-$(CONFIG_DRM_STI) = sti-drm.o