From: Kasin Lee <kasin.li@amlogic.com>
Date: Mon, 21 Jul 2014 07:04:18 +0000 (+0800)
Subject: Merge branch 'r4p0-01' of git://git.myamlogic.com/platform/hardware/arm/gpu into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7559b946c94fe7ba020bb1e84e60dc8cdbd96a55;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git

Merge branch 'r4p0-01' of git://git.myamlogic.com/platform/hardware/arm/gpu into r4p0-01

Conflicts:
	mali/Kbuild
	mali/platform/meson_m450/platform_m6tvd.c
	mali/platform/meson_m450/scaling.c
---

7559b946c94fe7ba020bb1e84e60dc8cdbd96a55
diff --cc mali/Kbuild
index cc72e1a,34762a6..e833198
--- a/mali/Kbuild
+++ b/mali/Kbuild
@@@ -171,6 -171,13 +171,12 @@@ mali-$(CONFIG_ARCH_MESON6TVD) += 
  
  mali-$(CONFIG_ARCH_MESON8B) += \
  	platform/meson_m450/platform_m8b.o
+ 
+ mali-$(CONFIG_ARCH_MESON8M2) += \
+ 	platform/meson_m450/platform_m8m2.o
+ 
+ mali-$(CONFIG_ARCH_MESONG9TV) += \
+ 	platform/meson_m450/platform_g9tv.o
 -
  endif
  ##################### end Kasin Added. ###################
  
diff --cc mali/platform/meson_m450/scaling.c
index 98d42d4,cf9edd5..57e9f69
--- a/mali/platform/meson_m450/scaling.c
+++ b/mali/platform/meson_m450/scaling.c
@@@ -24,7 -24,7 +24,11 @@@
  
  #include <meson_main.h>
  
++<<<<<<< HEAD
 +#define LOG_MALI_SCALING 1
++=======
+ #define LOG_MALI_SCALING 0
++>>>>>>> ae39dbaec5c0ea26fafeaf557ce022c55a9ad899
  
  static int num_cores_enabled;
  static int currentStep;