Commit c700835b authored by Mike Turquette's avatar Mike Turquette

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/232246Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
Cc: Rob Herring <robherring2@gmail.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
parent 6e973d2c
...@@ -12,16 +12,17 @@ ...@@ -12,16 +12,17 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/types.h>
struct clk *clk_reg_prcc_pclk(const char *name, struct clk *clk_reg_prcc_pclk(const char *name,
const char *parent_name, const char *parent_name,
unsigned int phy_base, resource_size_t phy_base,
u32 cg_sel, u32 cg_sel,
unsigned long flags); unsigned long flags);
struct clk *clk_reg_prcc_kclk(const char *name, struct clk *clk_reg_prcc_kclk(const char *name,
const char *parent_name, const char *parent_name,
unsigned int phy_base, resource_size_t phy_base,
u32 cg_sel, u32 cg_sel,
unsigned long flags); unsigned long flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment