diff options
author | Dave Airlie <airlied@redhat.com> | 2019-05-09 04:03:54 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-05-09 04:04:00 +0300 |
commit | eb85d03e01c3e9f3b0ba7282b2e3515a635decb2 (patch) | |
tree | acffc7d52bae052a8181a81725f9c44c5e432ac9 /drivers/gpu/drm/arm | |
parent | f2e8d169b2b96d234be7f109f8222d7fa4612899 (diff) | |
parent | 15273ffd7efdf6e9f21c4e4beef6539229167343 (diff) | |
download | linux-eb85d03e01c3e9f3b0ba7282b2e3515a635decb2.tar.xz |
Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- A handful of fixes from -next that just missed feature freeze
- More panfrost fixes that went directly in -misc-next-fixes (various)
- Fix searchpaths during build (Masahiro)
- msm patch to fix the driver for chips without zap shader (Rob)
- Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf)
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Rob Clark <robdclark@chromium.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190508205153.GA91135@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/arm')
-rw-r--r-- | drivers/gpu/drm/arm/display/komeda/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/arm/display/komeda/Makefile index 62bd1bff66a3..412eeba8c39f 100644 --- a/drivers/gpu/drm/arm/display/komeda/Makefile +++ b/drivers/gpu/drm/arm/display/komeda/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 ccflags-y := \ - -I$(src)/../include \ - -I$(src) + -I $(srctree)/$(src)/../include \ + -I $(srctree)/$(src) komeda-y := \ komeda_drv.o \ |