diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-08-28 14:27:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-28 14:27:15 +1000 |
| commit | e906d7bdd3b63ffac8b91f2f05c450775de95ef6 (patch) | |
| tree | 014e1f6a07067111d4b3ba94e3f9229a1e70e6d1 /drivers/gpu/drm/Makefile | |
| parent | acb4652703f0a452405a3ab9319594eddc41391b (diff) | |
| parent | bd6f82d8289422f618b98451a43887f452b3423e (diff) | |
Merge branch 'drm-next' of git://people.freedesktop.org/~robclark/linux into drm-next
Merge the MSM driver from Rob Clark
* 'drm-next' of git://people.freedesktop.org/~robclark/linux:
drm/msm: add basic hangcheck/recovery mechanism
drm/msm: add a3xx gpu support
drm/msm: add register definitions for gpu
drm/msm: basic KMS driver for snapdragon
drm/msm: add register definitions
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 7b2343a2f5eb..f089adfe70ee 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -54,4 +54,5 @@ obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/ obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-$(CONFIG_DRM_TILCDC) += tilcdc/ obj-$(CONFIG_DRM_QXL) += qxl/ +obj-$(CONFIG_DRM_MSM) += msm/ obj-y += i2c/ |