aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/ux500
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2013-04-22 14:46:10 -0400
committerMike Turquette <mturquette@linaro.org>2013-04-22 14:46:10 -0400
commitc700835bf8568f9c183c9b6aa7794d29266da15b (patch)
tree0c36d8795a67df3a16e966fa88e9bd1b6d2536be /drivers/clk/ux500
parent6e973d2c438502dcf956e76305258ba7d1c7d1d3 (diff)
clk: ux500: fix mismatched types
As reported by Rob Herring[1] there were some mismatched types between drivers/clk/ux500/clk.h and the corresponding function definitions: drivers/clk/ux500/clk-prcc.c:145:13: error: conflicting types for 'clk_reg_prcc_pclk' drivers/clk/ux500/clk-prcc.c:155:13: error: conflicting types for 'clk_reg_prcc_kclk' [1] http://article.gmane.org/gmane.linux.ports.arm.kernel/232246 Signed-off-by: Mike Turquette <mturquette@linaro.org> Cc: Rob Herring <robherring2@gmail.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/clk/ux500')
-rw-r--r--drivers/clk/ux500/clk.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/ux500/clk.h b/drivers/clk/ux500/clk.h
index 3d2dfdc71290..a2bb92d85ee0 100644
--- a/drivers/clk/ux500/clk.h
+++ b/drivers/clk/ux500/clk.h
@@ -12,16 +12,17 @@
12 12
13#include <linux/clk.h> 13#include <linux/clk.h>
14#include <linux/device.h> 14#include <linux/device.h>
15#include <linux/types.h>
15 16
16struct clk *clk_reg_prcc_pclk(const char *name, 17struct clk *clk_reg_prcc_pclk(const char *name,
17 const char *parent_name, 18 const char *parent_name,
18 unsigned int phy_base, 19 resource_size_t phy_base,
19 u32 cg_sel, 20 u32 cg_sel,
20 unsigned long flags); 21 unsigned long flags);
21 22
22struct clk *clk_reg_prcc_kclk(const char *name, 23struct clk *clk_reg_prcc_kclk(const char *name,
23 const char *parent_name, 24 const char *parent_name,
24 unsigned int phy_base, 25 resource_size_t phy_base,
25 u32 cg_sel, 26 u32 cg_sel,
26 unsigned long flags); 27 unsigned long flags);
27 28