From fe85565d9ed8212cbda2148d4731418a36a8d088 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Mon, 11 Dec 2017 21:53:28 +0100 Subject: [PATCH 1/3] drivers: Integrating Mali Midgard video and gpu drivers. I'm dropping the UMP drivers. They are not maintained. Signed-off-by: Myy Miouyouyou --- drivers/gpu/Makefile | 2 +- drivers/video/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index e9ed439a5..66386b42a 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -2,5 +2,5 @@ # taken to initialize them in the correct order. Link order is the only way # to ensure this currently. obj-$(CONFIG_TEGRA_HOST1X) += host1x/ -obj-y += drm/ vga/ +obj-y += drm/ vga/ arm/ obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3c20af999..041e15f2c 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -17,6 +17,7 @@ source "drivers/gpu/vga/Kconfig" source "drivers/gpu/host1x/Kconfig" source "drivers/gpu/ipu-v3/Kconfig" +source "drivers/gpu/arm/midgard/Kconfig" source "drivers/gpu/drm/Kconfig" -- 2.14.1