]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/armada: Fix compile fail
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 30 Dec 2016 16:38:52 +0000 (17:38 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 21 Apr 2017 08:11:48 +0000 (10:11 +0200)
BugLink: http://bugs.launchpad.net/bugs/1681875
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/gpu/drm/armada/Makefile

index a18f156c8b663627ee250a2f9e2867688bafb163..64c0b4546fb240f92d0e91a8bdb4faff69417a1f 100644 (file)
@@ -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)