From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 26 Mar 2014 03:48:32 +0000 (+0800)
Subject: ARM: rockchip: fix compile error multiple definition of dvfs_get_regulator when dvfs... 
X-Git-Tag: firefly_0821_release~5828
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a5bb0cb9f4fb78775e09bf38bbd3eac9e506a931;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: fix compile error multiple definition of dvfs_get_regulator when dvfs is deselected
---

diff --git a/include/linux/rockchip/dvfs.h b/include/linux/rockchip/dvfs.h
index 71a248f0be64..95bccb5fa956 100644
--- a/include/linux/rockchip/dvfs.h
+++ b/include/linux/rockchip/dvfs.h
@@ -190,7 +190,7 @@ static inline struct cpufreq_frequency_table *dvfs_get_freq_volt_table(struct dv
 static inline int rk_regist_vd(struct vd_node *vd){ return 0; };
 static inline int rk_regist_pd(struct pd_node *pd){ return 0; };
 static inline int rk_regist_clk(struct dvfs_node *clk_dvfs_node){ return 0; };
-struct regulator *dvfs_get_regulator(char *regulator_name){ return NULL; };
+static inline struct regulator *dvfs_get_regulator(char *regulator_name){ return NULL; };
 static inline int of_dvfs_init(void){ return 0; };
 #endif