diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:35:19 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:35:19 -0700 |
| commit | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (patch) | |
| tree | 9d4558065a2586c25a0c0c3d87ed8402981d616d /arch/arm/mach-omap1/clock.c | |
| parent | c8f626fe1c7e6de983b0c3b6375da69ded3313b6 (diff) | |
| parent | 59dd7224892142fe1d8505cf2c90bd732d730005 (diff) | |
| download | blackbird-op-linux-4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9.tar.gz blackbird-op-linux-4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9.zip | |
Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index e0aec1007a0d..6bbb1b8b8294 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -578,7 +578,7 @@ int omap1_clk_set_rate(struct clk *clk, unsigned long rate) #ifdef CONFIG_OMAP_RESET_CLOCKS -void __init omap1_clk_disable_unused(struct clk *clk) +void omap1_clk_disable_unused(struct clk *clk) { __u32 regval32; |
