summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-12-30 17:38:52 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-08 09:35:09 +0200
commit1229cd2fa5e03b533812ff9435a222e554acef35 (patch)
treed4c99125e72b509b7cc090125304583c96cadc1e /drivers/gpu
parent847f0ffc12aeb13ea9b058ffefa5f2180a840b9b (diff)
downloadtalos-obmc-linux-1229cd2fa5e03b533812ff9435a222e554acef35.tar.gz
talos-obmc-linux-1229cd2fa5e03b533812ff9435a222e554acef35.zip
drm/armada: Fix compile fail
commit 7357f89954b6d005df6ab8929759e78d7d9a80f9 upstream. I reported the include issue for tracepoints a while ago, but nothing seems to have happened. Now it bit us, since the drm_mm_print conversion was broken for armada. Fix it, so I can re-enable armada in the drm-misc build configs. v2: Rebase just the compile fix on top of Chris' build fix. Cc: Russell King <rmk+kernel@armlinux.org.uk> Cc: Chris Wilson <chris@chris-wilson.co.uk> Acked: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1483115932-19584-1-git-send-email-daniel.vetter@ffwll.ch Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/armada/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
index a18f156c8b66..64c0b4546fb2 100644
--- a/drivers/gpu/drm/armada/Makefile
+++ b/drivers/gpu/drm/armada/Makefile
@@ -4,3 +4,5 @@ armada-y += armada_510.o
armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
obj-$(CONFIG_DRM_ARMADA) := armada.o
+
+CFLAGS_armada_trace.o := -I$(src)
OpenPOWER on IntegriCloud