---

yaml --- r: 306485 b: refs/heads/master c: e6364a9 h: refs/heads/master i: 306483: 84a6b0d v: v3
git-mirror · May 20, 2012 · 88652cc · 88652cc
1 parent b5896c4
commit 88652cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@