diff options
author | Dave Airlie <airlied@redhat.com> | 2014-04-04 08:03:21 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-04-04 08:03:21 +1000 |
commit | 2614dc66837c2a6fd0e14e3f8e72343782c8b784 (patch) | |
tree | add8d8f2394ab8bc696ca787bf2c14ef45a88297 /drivers/gpu/drm/msm/Makefile | |
parent | d9961b22716ddf59ca307fe862f93ff0ea919952 (diff) | |
parent | 06fb220b2d1a80be5621fa06ef276a3890e6be78 (diff) | |
download | linux-2614dc66837c2a6fd0e14e3f8e72343782c8b784.tar.bz2 |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
drm/omap: Don't dereference list head when the connectors list is empty
drm/msm/mdp: add timeout for irq wait
drm/msm: validate flags, etc
drm/msm: use componentised device support
drm/msm: add chip-id param
drm/msm: crank down gpu when inactive
drm/msm: spin helper
drm/msm: add hang_debug module param
drm/msm: hdmi audio support
Diffstat (limited to 'drivers/gpu/drm/msm/Makefile')
-rw-r--r-- | drivers/gpu/drm/msm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 4f977a593bea..5e1e6b0cd8ac 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -7,6 +7,7 @@ msm-y := \ adreno/adreno_gpu.o \ adreno/a3xx_gpu.o \ hdmi/hdmi.o \ + hdmi/hdmi_audio.o \ hdmi/hdmi_bridge.o \ hdmi/hdmi_connector.o \ hdmi/hdmi_i2c.o \ |