diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-20 13:09:46 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-20 13:09:46 -0400 |
commit | cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4 (patch) | |
tree | 8e485f710138a330a56285b2a17d7debadf81c9b /arch/arm/mach-s3c2440 | |
parent | b5930b83c2791bd3b2da120f98f844f96fb2ca50 (diff) | |
parent | e48055999575750158108b4cfc7fc22e4c972efc (diff) |
Merge branch 'next-samsung-clkdev-fix' into next-samsung-cleanup
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r-- | arch/arm/mach-s3c2440/clock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index 3dc2426e2345..554e0d3ec70b 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c | |||
@@ -90,14 +90,12 @@ static int s3c2440_camif_upll_setrate(struct clk *clk, unsigned long rate) | |||
90 | 90 | ||
91 | static struct clk s3c2440_clk_cam = { | 91 | static struct clk s3c2440_clk_cam = { |
92 | .name = "camif", | 92 | .name = "camif", |
93 | .id = -1, | ||
94 | .enable = s3c2410_clkcon_enable, | 93 | .enable = s3c2410_clkcon_enable, |
95 | .ctrlbit = S3C2440_CLKCON_CAMERA, | 94 | .ctrlbit = S3C2440_CLKCON_CAMERA, |
96 | }; | 95 | }; |
97 | 96 | ||
98 | static struct clk s3c2440_clk_cam_upll = { | 97 | static struct clk s3c2440_clk_cam_upll = { |
99 | .name = "camif-upll", | 98 | .name = "camif-upll", |
100 | .id = -1, | ||
101 | .ops = &(struct clk_ops) { | 99 | .ops = &(struct clk_ops) { |
102 | .set_rate = s3c2440_camif_upll_setrate, | 100 | .set_rate = s3c2440_camif_upll_setrate, |
103 | .round_rate = s3c2440_camif_upll_round, | 101 | .round_rate = s3c2440_camif_upll_round, |
@@ -106,7 +104,6 @@ static struct clk s3c2440_clk_cam_upll = { | |||
106 | 104 | ||
107 | static struct clk s3c2440_clk_ac97 = { | 105 | static struct clk s3c2440_clk_ac97 = { |
108 | .name = "ac97", | 106 | .name = "ac97", |
109 | .id = -1, | ||
110 | .enable = s3c2410_clkcon_enable, | 107 | .enable = s3c2410_clkcon_enable, |
111 | .ctrlbit = S3C2440_CLKCON_CAMERA, | 108 | .ctrlbit = S3C2440_CLKCON_CAMERA, |
112 | }; | 109 | }; |