diff --git a/[refs] b/[refs]
index bb40deaae8ef..4416468958f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac47f1822fcb97018e24b05a7fb31f11a6bc28c
+refs/heads/master: 81b9f70210b62e256cf63eb8f703042ef44e4cdd
diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c
index c67dd2ebcff5..fe6cd0c3bdd3 100644
--- a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c
@@ -1280,18 +1280,6 @@ static int fimc_lite_subdev_s_stream(struct v4l2_subdev *sd, int on)
 	return ret;
 }
 
-static int fimc_lite_subdev_s_power(struct v4l2_subdev *sd, int on)
-{
-	struct fimc_lite *fimc = v4l2_get_subdevdata(sd);
-
-	if (fimc->out_path == FIMC_IO_DMA)
-		return -ENOIOCTLCMD;
-
-	/* TODO: */
-
-	return 0;
-}
-
 static int fimc_lite_log_status(struct v4l2_subdev *sd)
 {
 	struct fimc_lite *fimc = v4l2_get_subdevdata(sd);
@@ -1391,7 +1379,6 @@ static const struct v4l2_subdev_video_ops fimc_lite_subdev_video_ops = {
 };
 
 static const struct v4l2_subdev_core_ops fimc_lite_core_ops = {
-	.s_power = fimc_lite_subdev_s_power,
 	.log_status = fimc_lite_log_status,
 };