diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-24 17:27:06 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 18:50:22 +0100 |
| commit | 6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (patch) | |
| tree | c63888f76d8b06749970ab328d088d3887b64c16 /drivers/media/video/omap24xxcam.c | |
| parent | [ARM] omap: convert omap RNG clocks to match by devid and conid (diff) | |
| download | linux-6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b.tar.xz linux-6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b.zip | |
[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/media/video/omap24xxcam.c')
| -rw-r--r-- | drivers/media/video/omap24xxcam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 73eb656acfe3..805faaea6449 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c @@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam) { int rval = 0; - cam->fck = clk_get(cam->dev, "cam_fck"); + cam->fck = clk_get(cam->dev, "fck"); if (IS_ERR(cam->fck)) { - dev_err(cam->dev, "can't get cam_fck"); + dev_err(cam->dev, "can't get camera fck"); rval = PTR_ERR(cam->fck); omap24xxcam_clock_put(cam); return rval; } - cam->ick = clk_get(cam->dev, "cam_ick"); + cam->ick = clk_get(cam->dev, "ick"); if (IS_ERR(cam->ick)) { - dev_err(cam->dev, "can't get cam_ick"); + dev_err(cam->dev, "can't get camera ick"); rval = PTR_ERR(cam->ick); omap24xxcam_clock_put(cam); } |