diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-10-28 11:14:50 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-10-28 11:14:50 +0100 |
| commit | 4f8922aafd86c0a92aeb41484aaff07bef3f7ffe (patch) | |
| tree | 0672359055ff0d915ae75fc3e0b1ce6ef9d20f80 /drivers/gpu/Makefile | |
| parent | 5354141df8257eca5c863d71704f023beeb775e9 (diff) | |
| parent | b017e4726d4c5cfa7ca4f475e2a0d903abd330b1 (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into lsk-3.18-armltlsk-3.18-armlt-20161028lsk-3.18-armlt
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/gpu/Makefile')
| -rw-r--r-- | drivers/gpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index 70da9eb52a42..b6641febc830 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1,3 +1,3 @@ -obj-y += drm/ vga/ +obj-y += drm/ vga/ arm/ obj-$(CONFIG_TEGRA_HOST1X) += host1x/ obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ |