Merge tag 'sound-fix-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / gpu / drm / sti / Makefile

diff --git a/drivers/gpu/drm/sti/Makefile b/drivers/gpu/drm/sti/Makefile
index e27490b492a5280a254b9a196d452f429abb9466..b8057620b3b35702f23476584c15efc0d2a7763e 100644 (file)
--- a/drivers/gpu/drm/sti/Makefile
+++ b/drivers/gpu/drm/sti/Makefile
@@ -1,26 +1,23 @@
-sticompositor-y := \
+sti-drm-y := \
        sti_mixer.o \
        sti_gdp.o \
        sti_vid.o \
        sti_cursor.o \
        sti_compositor.o \
        sti_crtc.o \
-       sti_plane.o
-
-stihdmi-y := sti_hdmi.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_drv.o
+
+obj-$(CONFIG_DRM_STI) = sti-drm.o