From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 12 Dec 2014 06:12:56 +0000 (+0800)
Subject: Merge branch develop-3.10 into develop-3.10-next
X-Git-Tag: firefly_0821_release~4158^2~536
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=801c2bd37821e66de100e8f4a0729d9242fb34c7

Merge branch develop-3.10 into develop-3.10-next
---

801c2bd37821e66de100e8f4a0729d9242fb34c7
diff --cc arch/arm/mach-rockchip/common.c
index 82b574275fc9,e2fa463f8c56..a3d129a0a272
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@@ -21,11 -21,10 +21,12 @@@
  #include <linux/of_platform.h>
  #include <linux/of_fdt.h>
  #include <asm/cputype.h>
 +#ifdef CONFIG_CACHE_L2X0
  #include <asm/hardware/cache-l2x0.h>
 +#endif
  #include <linux/rockchip/common.h>
  #include <linux/rockchip/pmu.h>
+ #include <linux/memblock.h>
  #include "cpu_axi.h"
  #include "loader.h"
  #include "sram.h"