Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c

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);
         }