From 88652cc6188aa8324896f61157c260c9c160dbc0 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 12 Mar 2012 03:13:34 -0300 Subject: [PATCH] --- yaml --- r: 306485 b: refs/heads/master c: e6364a987413b9e5413b48e9d31ecdd2b02bb28b h: refs/heads/master i: 306483: 84a6b0de79bcfdd58a110d847ac3ffdde40a6ea2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-tv/mixer.h | 2 +- trunk/drivers/media/video/s5p-tv/mixer_video.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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;