diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 15:41:15 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 15:41:26 +0000 |
commit | 9b963f32c38b4c7d2da667e4458967b550f30bee (patch) | |
tree | be4ed36669fe831fe0d5feaddcc8dfb39809e32e /arch/arm/mach-davinci/tnetv107x.c | |
parent | 4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1 (diff) | |
parent | 60d97a840175d3becb2e6de36537a5cdfc0ec3a9 (diff) |
Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
Diffstat (limited to 'arch/arm/mach-davinci/tnetv107x.c')
-rw-r--r-- | arch/arm/mach-davinci/tnetv107x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c index 6fcdecec8d8..1b28fdd892a 100644 --- a/arch/arm/mach-davinci/tnetv107x.c +++ b/arch/arm/mach-davinci/tnetv107x.c @@ -278,7 +278,7 @@ static struct clk_lookup clks[] = { CLK(NULL, "timer1", &clk_timer1), CLK("tnetv107x_wdt.0", NULL, &clk_wdt_arm), CLK(NULL, "clk_wdt_dsp", &clk_wdt_dsp), - CLK("ti-ssp.0", NULL, &clk_ssp), + CLK("ti-ssp", NULL, &clk_ssp), CLK(NULL, "clk_tdm0", &clk_tdm0), CLK(NULL, "clk_vlynq", &clk_vlynq), CLK(NULL, "clk_mcdma", &clk_mcdma), |