diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:43:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:43:22 +0200 |
| commit | 32d80f97fe4a86b7e9de5d13030432de115119b1 (patch) | |
| tree | 54b95741024e8926348fa15d43579d49f4743553 /arch/arm/mach-s5pv210/clock.c | |
| parent | 3a3ad60176fafb027bf2e4fe4793eab99ced5708 (diff) | |
| parent | 100aafc992039794d0facb0e7bbd02f8a11fd1d6 (diff) | |
Merge branch 'imx/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-s5pv210/clock.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/clock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index 52a8e607bcc..f5f8fa89679 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c @@ -815,8 +815,7 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 }, }, { .clk = { - .name = "sclk_cam", - .devname = "s5pv210-fimc.0", + .name = "sclk_cam0", .enable = s5pv210_clk_mask0_ctrl, .ctrlbit = (1 << 3), }, @@ -825,8 +824,7 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 }, }, { .clk = { - .name = "sclk_cam", - .devname = "s5pv210-fimc.1", + .name = "sclk_cam1", .enable = s5pv210_clk_mask0_ctrl, .ctrlbit = (1 << 4), }, |