From d484b2dfed9c2de465f267c4b341b08ce5507725 Mon Sep 17 00:00:00 2001 From: Shawn Xiao Date: Tue, 22 Sep 2015 16:41:11 +0800 Subject: [PATCH] MGS-955-3 GPU module integration Fixed wrong symbols of GPU in mxc/Makefile. Date Sep 22, 2015 Signed-off-by: Shawn Xiao --- drivers/mxc/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mxc/Makefile b/drivers/mxc/Makefile index d6e58cd701d8..e2ae1a010527 100644 --- a/drivers/mxc/Makefile +++ b/drivers/mxc/Makefile @@ -3,5 +3,4 @@ obj-$(CONFIG_MXC_SIM) += sim/ obj-$(CONFIG_MXC_VPU) += vpu/ obj-$(CONFIG_MXC_IPU_V3) += ipu3/ obj-$(CONFIG_MXC_HDMI_CEC) += hdmi-cec/ -obj-$(CONFIG_MXC_SIM) += gpu-viv/ ->>>>>>> MGS-955 GPU:Integrate GPU module +obj-$(CONFIG_MXC_GPU_VIV) += gpu-viv/ -- 2.17.1