---

yaml --- r: 357552 b: refs/heads/master c: cfb046c h: refs/heads/master v: v3
git-mirror · Feb 11, 2013 · 6b46f6e · 6b46f6e
1 parent 48d28fa
commit 6b46f6e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f6984ecefb9b84f1b4d1d3b9022731bb8b62d0
+refs/heads/master: cfb046cb800ba306b211fbbe4ac633486e11055f
diff --git a/trunk/drivers/media/pci/cx18/cx18-alsa-main.c b/trunk/drivers/media/pci/cx18/cx18-alsa-main.c
@@ -197,7 +197,7 @@ static int snd_cx18_init(struct v4l2_device *v4l2_dev)
 	return ret;
 }
 
-static int __init cx18_alsa_load(struct cx18 *cx)
+static int cx18_alsa_load(struct cx18 *cx)
 {
 	struct v4l2_device *v4l2_dev = &cx->v4l2_dev;
 	struct cx18_stream *s;

diff --git a/trunk/drivers/media/pci/cx18/cx18-alsa-pcm.h b/trunk/drivers/media/pci/cx18/cx18-alsa-pcm.h
@@ -20,7 +20,7 @@
  *  02111-1307  USA
  */
 
-int __init snd_cx18_pcm_create(struct snd_cx18_card *cxsc);
+int snd_cx18_pcm_create(struct snd_cx18_card *cxsc);
 
 /* Used by cx18-mailbox to announce the PCM data to the module */
 void cx18_alsa_announce_pcm_data(struct snd_cx18_card *card, u8 *pcm_data,

diff --git a/trunk/drivers/media/pci/ivtv/ivtv-alsa-main.c b/trunk/drivers/media/pci/ivtv/ivtv-alsa-main.c
@@ -205,7 +205,7 @@ static int snd_ivtv_init(struct v4l2_device *v4l2_dev)
 	return ret;
 }
 
-static int __init ivtv_alsa_load(struct ivtv *itv)
+static int ivtv_alsa_load(struct ivtv *itv)
 {
 	struct v4l2_device *v4l2_dev = &itv->v4l2_dev;
 	struct ivtv_stream *s;

diff --git a/trunk/drivers/media/pci/ivtv/ivtv-alsa-pcm.h b/trunk/drivers/media/pci/ivtv/ivtv-alsa-pcm.h
@@ -20,4 +20,4 @@
  *  02111-1307  USA
  */
 
-int __init snd_ivtv_pcm_create(struct snd_ivtv_card *itvsc);
+int snd_ivtv_pcm_create(struct snd_ivtv_card *itvsc);