From: dalon.zhang <dalon.zhang@rock-chips.com>
Date: Thu, 19 Mar 2015 08:42:17 +0000 (+0800)
Subject: Merge branch 'rk_develop-3.10' into rk_develop-3.10-next
X-Git-Tag: firefly_0821_release~4158^2~334
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bf3c956402dcbea85d4551dbe9bd2ee1451a3a8d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

Conflicts:
	drivers/mmc/host/rk_sdmmc.c
---

bf3c956402dcbea85d4551dbe9bd2ee1451a3a8d
diff --cc drivers/mmc/host/rk_sdmmc.c
index 1276d727e680,e4488a8de558..ae0a86ccdec8
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@@ -46,8 -46,7 +46,9 @@@
  #include <linux/clk-private.h>
  #include <linux/rockchip/cpu.h>
  #include <linux/rfkill-wlan.h>
 +#include <linux/mfd/syscon.h>
 +#include <linux/regmap.h>
+ #include <linux/log2.h>
  #include "rk_sdmmc.h"
  #include "rk_sdmmc_dbg.h"
  #include <linux/regulator/rockchip_io_vol_domain.h>