From 5b3cad83fec73834ab318e188c20a0946f1ac36f Mon Sep 17 00:00:00 2001 From: YoungJun Cho Date: Thu, 2 Jul 2015 19:44:49 +0900 Subject: [PATCH] ARM: mali400: r5p2_rel0: delete proprietary word in Kbuild This is to guid for non-gpl case, not related with license, but Tango detects it because it simply compares string. Change-Id: Iad42e139fd5d040b3242f1e7358720ef24343570 Signed-off-by: YoungJun Cho [jy0922.shim: applied to r5p2_rel0 from r5p0_rel0] Signed-off-by: Joonyoung Shim --- drivers/gpu/arm/mali400/r5p2_rel0/Kbuild | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/arm/mali400/r5p2_rel0/Kbuild b/drivers/gpu/arm/mali400/r5p2_rel0/Kbuild index 4af73700354c..3f412c4c6a93 100644 --- a/drivers/gpu/arm/mali400/r5p2_rel0/Kbuild +++ b/drivers/gpu/arm/mali400/r5p2_rel0/Kbuild @@ -24,24 +24,8 @@ MALI_ENABLE_CPU_CYCLES ?= 0 MALI_PLATFORM ?= exynos MALI_FAKE_PLATFORM_DEVICE ?= 1 -# For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases: -# The ARM proprietary product will only include the license/proprietary directory # The GPL product will only include the license/gpl directory -ifeq ($(wildcard $(src)/linux/license/gpl/*),) - ccflags-y += -I$(src)/linux/license/proprietary - ifeq ($(CONFIG_MALI400_PROFILING),y) - $(error Profiling is incompatible with non-GPL license) - endif - ifeq ($(CONFIG_PM_RUNTIME),y) - $(error Runtime PM is incompatible with non-GPL license) - endif - ifeq ($(CONFIG_DMA_SHARED_BUFFER),y) - $(error DMA-BUF is incompatible with non-GPL license) - endif - $(error Linux Device integration is incompatible with non-GPL license) -else - ccflags-y += -I$(src)/linux/license/gpl -endif +ccflags-y += -I$(src)/linux/license/gpl ifeq ($(USING_GPU_UTILIZATION), 1) ifeq ($(USING_DVFS), 1) -- 2.34.1