diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-23 13:01:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-23 13:01:56 +1000 |
| commit | 8a105aaa25f4504d26ca828f12d709d2213a230e (patch) | |
| tree | 46ac9e1fba4abeaa97b957258ded90abf385389f /drivers/gpu/drm/Makefile | |
| parent | 7296c849bf2eca2bd7d34a4686a53e3089150ac1 (diff) | |
| parent | 9611cb93fa65dde199f4f888bd034ffc80c7adf0 (diff) | |
| download | linux-8a105aaa25f4504d26ca828f12d709d2213a230e.tar.gz linux-8a105aaa25f4504d26ca828f12d709d2213a230e.tar.bz2 linux-8a105aaa25f4504d26ca828f12d709d2213a230e.zip | |
Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next
Merge armada changes, I've confirmed the componenet changes are same as in Greg's tree.
* 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
drm/armada: register crtc with port
drm/armada: permit CRTCs to be registered as separate devices
dt-bindings: add Marvell Dove LCD controller documentation
drm/armada: update Armada 510 (Dove) to use "ext_ref_clk1" as the clock
drm/armada: convert to componentized support
drm: add of_graph endpoint helper to find possible CRTCs
component: fix bug with legacy API
drm/armada: make variant a CRTC thing
drm/armada: move variant initialisation to CRTC init
drm/armada: use number of CRTCs registered
drm/armada: move IRQ handling into CRTC
component: add support for component match array
component: ignore multiple additions of the same component
component: fix missed cleanup in case of devres failure
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 af9a609861c2..61d9e9c6bc10 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -20,6 +20,7 @@ drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_PCI) += ati_pcigart.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o +drm-$(CONFIG_OF) += drm_of.o drm-usb-y := drm_usb.o |