diff --git a/[refs] b/[refs]
index cd9ddd1adf6f..632c938acde2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6a6ddc4d084774bac14df8b8867a42739cf142
+refs/heads/master: e6364a987413b9e5413b48e9d31ecdd2b02bb28b
diff --git a/trunk/drivers/media/video/s5p-tv/mixer.h b/trunk/drivers/media/video/s5p-tv/mixer.h
index fa3e30f27447..ddb422e23550 100644
--- a/trunk/drivers/media/video/s5p-tv/mixer.h
+++ b/trunk/drivers/media/video/s5p-tv/mixer.h
@@ -294,7 +294,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
 	struct mxr_output_conf *output_cont, int output_count);
 
 /** releasing common video resources */
-void __devexit mxr_release_video(struct mxr_device *mdev);
+void mxr_release_video(struct mxr_device *mdev);
 
 struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx);
 struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx);
diff --git a/trunk/drivers/media/video/s5p-tv/mixer_video.c b/trunk/drivers/media/video/s5p-tv/mixer_video.c
index fa7feb53ffd7..33fde2a763ec 100644
--- a/trunk/drivers/media/video/s5p-tv/mixer_video.c
+++ b/trunk/drivers/media/video/s5p-tv/mixer_video.c
@@ -140,7 +140,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
 	return ret;
 }
 
-void __devexit mxr_release_video(struct mxr_device *mdev)
+void mxr_release_video(struct mxr_device *mdev)
 {
 	int i;