diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /arch/arm/mach-ux500/clock.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-ux500/clock.c')
| -rw-r--r-- | arch/arm/mach-ux500/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index b5fc2e21961d..fe84b9021c7a 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c | |||
| @@ -502,7 +502,7 @@ static struct clk_lookup u8500_common_clks[] = { | |||
| 502 | CLK(apetraceclk, "apetrace", NULL), | 502 | CLK(apetraceclk, "apetrace", NULL), |
| 503 | CLK(mcdeclk, "mcde", NULL), | 503 | CLK(mcdeclk, "mcde", NULL), |
| 504 | CLK(ipi2clk, "ipi2", NULL), | 504 | CLK(ipi2clk, "ipi2", NULL), |
| 505 | CLK(dmaclk, "dma40", NULL), | 505 | CLK(dmaclk, "dma40.0", NULL), |
| 506 | CLK(b2r2clk, "b2r2", NULL), | 506 | CLK(b2r2clk, "b2r2", NULL), |
| 507 | CLK(tvclk, "tv", NULL), | 507 | CLK(tvclk, "tv", NULL), |
| 508 | }; | 508 | }; |