diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 02:09:46 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-21 02:09:46 +0900 |
| commit | cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4 (patch) | |
| tree | 8e485f710138a330a56285b2a17d7debadf81c9b /arch/arm/mach-s3c2440 | |
| parent | b5930b83c2791bd3b2da120f98f844f96fb2ca50 (diff) | |
| parent | e48055999575750158108b4cfc7fc22e4c972efc (diff) | |
| download | talos-op-linux-cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4.tar.gz talos-op-linux-cf2e9c7b48f1e6c715e30952e5a3a5ef5cd0f8e4.zip | |
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) static struct clk s3c2440_clk_cam = { .name = "camif", - .id = -1, .enable = s3c2410_clkcon_enable, .ctrlbit = S3C2440_CLKCON_CAMERA, }; static struct clk s3c2440_clk_cam_upll = { .name = "camif-upll", - .id = -1, .ops = &(struct clk_ops) { .set_rate = s3c2440_camif_upll_setrate, .round_rate = s3c2440_camif_upll_round, @@ -106,7 +104,6 @@ static struct clk s3c2440_clk_cam_upll = { static struct clk s3c2440_clk_ac97 = { .name = "ac97", - .id = -1, .enable = s3c2410_clkcon_enable, .ctrlbit = S3C2440_CLKCON_CAMERA, }; |
