Skip to content

Commit

Permalink
clk: ux500: fix mismatched types
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Turquette committed Apr 22, 2013
1 parent 6e973d2 commit c700835
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/clk/ux500/clk.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@

#include <linux/clk.h>
#include <linux/device.h>
#include <linux/types.h>

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);

Expand Down

0 comments on commit c700835

Please sign in to comment.