projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e699e63)
MGS-955-3 GPU module integration
authorShawn Xiao <b49994@freescale.com>
Tue, 22 Sep 2015 08:41:11 +0000 (16:41 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:36 +0000 (14:48 -0500)
Fixed wrong symbols of GPU in mxc/Makefile.

Date Sep 22, 2015

Signed-off-by: Shawn Xiao <b49994@freescale.com>
drivers/mxc/Makefile patch | blob | history

diff --git a/drivers/mxc/Makefile b/drivers/mxc/Makefile
index d6e58cd..e2ae1a0 100644 (file)
--- 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/