From 0b55f602dca6049a2b802dd7fbba28776865fd01 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 27 Sep 2011 07:00:53 +0900 Subject: [PATCH] --- yaml --- r: 264131 b: refs/heads/master c: 83427c23a44e34be2985f5b1440c645ea8577938 h: refs/heads/master i: 264129: 3f3593ac2f01e9b14161030c4062812161a048bd 264127: 3bc04219f909fc9701ab83a3a3d19f8433ecda58 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv210/clock.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a7cd0e5a903..b924991f9db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b76f7cdca5af18fa7a59a5c8a9eb5e02418e827a +refs/heads/master: 83427c23a44e34be2985f5b1440c645ea8577938 diff --git a/trunk/arch/arm/mach-s5pv210/clock.c b/trunk/arch/arm/mach-s5pv210/clock.c index 52a8e607bcc2..f5f8fa89679c 100644 --- a/trunk/arch/arm/mach-s5pv210/clock.c +++ b/trunk/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), },