diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-01-31 11:01:02 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-02-09 11:16:09 +0530 |
| commit | 52d12cbc3bc7b77c591d72ebf6553f819b46c962 (patch) | |
| tree | 9b8a89fc97f75803a8f14a2e12bc780dfbaa3dd7 | |
| parent | a291ac38abc82489d893e76a3edad1a500211ac6 (diff) | |
mali: Remove compile time warningssamsung-lt-v3.3-rc3linux-mainline-2012-03
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/mali/config.h | 6 | ||||
| -rwxr-xr-x | drivers/gpu/arm/mali/Makefile | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/include/mach/mali/config.h b/arch/arm/mach-exynos/include/mach/mali/config.h index e936532649de..4f95209de12d 100644 --- a/arch/arm/mach-exynos/include/mach/mali/config.h +++ b/arch/arm/mach-exynos/include/mach/mali/config.h @@ -38,10 +38,10 @@ #define MEM_MALI_SIZE CONFIG_MALI_MEM_SIZE*1024*1024 #define MEM_MALI_BASE 0x60000000 - MEM_MALI_SIZE -#define S5P_IRQ(x) (x+32) -#define IRQ_SPI(x) S5P_IRQ(x+32) +//#define S5P_IRQ(x) (x+32) +//#define IRQ_SPI(x) S5P_IRQ(x+32) #define MAX_IRQ_IN_COMBINER 8 -#define COMBINER_GROUP(x) ((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64)) +//#define COMBINER_GROUP(x) ((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64)) #define COMBINER_IRQ(x, y) (COMBINER_GROUP(x) + y) #define IRQ_PPMMU0_3D COMBINER_IRQ(13, 0) diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index fd45d0fa75f1..2cdb59f2b41a 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -14,10 +14,12 @@ MALI_FILE_PREFIX := $(srctree)/drivers/gpu/arm/mali KBUILDROOT = # Add platform configuration file for Mali -ifeq ($(CONFIG_ARCH_EXYNOS4),y) +#ifeq ($(CONFIG_ARCH_EXYNOS4),y) MACHDIR := $(srctree)/arch/arm/mach-exynos MALICONFIGDIR :=$(MACHDIR)/include/mach/mali -endif +#endif + +USING_DED=0 ifeq ($(CONFIG_USING_MMU),y) USING_MMU=1 |