From 8a4fa829b2552697da28cb7c5abb35ee9613e268 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 4 Jun 2013 00:05:07 +0200 Subject: [PATCH] --- yaml --- r: 377161 b: refs/heads/master c: 0b63cc3ce11822ac96a334a345640f524212cd6b h: refs/heads/master i: 377159: 5cc30b2eb022fde9409e0a3322c3c285f7872e4a v: v3 --- [refs] | 2 +- trunk/drivers/clk/spear/spear3xx_clock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a8c4fae7f50..2c712ee6cc0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 071ff9a36cb08b5a2b099fcdb45b63a61618f928 +refs/heads/master: 0b63cc3ce11822ac96a334a345640f524212cd6b diff --git a/trunk/drivers/clk/spear/spear3xx_clock.c b/trunk/drivers/clk/spear/spear3xx_clock.c index f9ec43fd1320..080c3c5e33f6 100644 --- a/trunk/drivers/clk/spear/spear3xx_clock.c +++ b/trunk/drivers/clk/spear/spear3xx_clock.c @@ -369,7 +369,7 @@ static void __init spear320_clk_init(void __iomem *soc_config_base) clk_register_clkdev(clk, NULL, "60100000.serial"); } #else -static inline void spear320_clk_init(void) { } +static inline void spear320_clk_init(void __iomem *soc_config_base) { } #endif void __init spear3xx_clk_init(void __iomem *misc_base, void __iomem *soc_config_base)