| Message ID | 2592841.P0ZcyhdZJA@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jun 4, 2013 at 3:35 AM, Arnd Bergmann <arnd@arndb.de> wrote: > This patch is required to be able to disable spear320 support > after the spear320_clk_init() prototype changed for the real > function but not for the dummy. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Quoting Arnd Bergmann (2013-06-03 15:05:07) > This patch is required to be able to disable spear320 support > after the spear320_clk_init() prototype changed for the real > function but not for the dummy. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Pulled into clk-fixes. Thanks, Mike > > diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c > index f9ec43f..080c3c5 100644 > --- a/drivers/clk/spear/spear3xx_clock.c > +++ b/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)
diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c index f9ec43f..080c3c5 100644 --- a/drivers/clk/spear/spear3xx_clock.c +++ b/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)
This patch is required to be able to disable spear320 support after the spear320_clk_init() prototype changed for the real function but not for the dummy. Signed-off-by: Arnd Bergmann <arnd@arndb.de>