From c700835bf8568f9c183c9b6aa7794d29266da15b Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Mon, 22 Apr 2013 11:46:10 -0700 Subject: [PATCH] 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 Cc: Rob Herring Cc: Ulf Hansson Cc: Linus Walleij --- drivers/clk/ux500/clk.h | 5 +++-- 1 file 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 @@ #include #include +#include struct clk *clk_reg_prcc_pclk(const char *name, const char *parent_name, - unsigned int phy_base, + resource_size_t phy_base, u32 cg_sel, unsigned long flags); struct clk *clk_reg_prcc_kclk(const char *name, const char *parent_name, - unsigned int phy_base, + resource_size_t phy_base, u32 cg_sel, unsigned long flags); -- 2.39.2