From 4a3886f640c2434479bd348672f6d5b694b9ee05 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 27 Oct 2012 11:28:50 -0300
Subject: [PATCH] --- yaml --- r: 343807 b: refs/heads/master c:
 5e6e81b2890db3969527772a8350825a85c22d5c h: refs/heads/master i:   343805:
 fa08f8eb8917b958e4837c9775e3b17bd4163f25   343803:
 96fdd9ccd34add7aa8469677f66249189c7a15fb   343799:
 8ac70e8e5ec641aab194ee18e3a7e7a9d0eacfbc   343791:
 0f5e0bcfa9accf07b59e83cd123cd2534780278c   343775:
 9ceb257b76bc1b8be21f864108c2c2774cb785a5   343743:
 fa8536d2740b2655859776819c06797c3fca4491   343679:
 ea9d287e44aa248b7871414b0c6a4dea24293a0d   343551:
 ce28f3ce3a368972ce0ed61f0cfc827ed3accc12 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/pci/cx18/cx18-alsa-main.c | 2 +-
 trunk/drivers/media/pci/cx18/cx18-alsa-pcm.c  | 1 +
 trunk/drivers/media/pci/cx18/cx18-streams.c   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7cd2041d2f57..2705fc63c669 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e373217887879cea6cea3483d2dad21278d0f05
+refs/heads/master: 5e6e81b2890db3969527772a8350825a85c22d5c
diff --git a/trunk/drivers/media/pci/cx18/cx18-alsa-main.c b/trunk/drivers/media/pci/cx18/cx18-alsa-main.c
index 6d2a98246b6d..8e971ff60588 100644
--- 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;
 }
 
-int cx18_alsa_load(struct cx18 *cx)
+static int __init 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.c b/trunk/drivers/media/pci/cx18/cx18-alsa-pcm.c
index 7a5b84a86bb3..180077c49123 100644
--- a/trunk/drivers/media/pci/cx18/cx18-alsa-pcm.c
+++ b/trunk/drivers/media/pci/cx18/cx18-alsa-pcm.c
@@ -37,6 +37,7 @@
 #include "cx18-streams.h"
 #include "cx18-fileops.h"
 #include "cx18-alsa.h"
+#include "cx18-alsa-pcm.h"
 
 static unsigned int pcm_debug;
 module_param(pcm_debug, int, 0644);
diff --git a/trunk/drivers/media/pci/cx18/cx18-streams.c b/trunk/drivers/media/pci/cx18/cx18-streams.c
index 72af9b5c2d7d..843c62b2f482 100644
--- a/trunk/drivers/media/pci/cx18/cx18-streams.c
+++ b/trunk/drivers/media/pci/cx18/cx18-streams.c
@@ -97,7 +97,7 @@ static struct {
 };
 
 
-void cx18_dma_free(struct videobuf_queue *q,
+static void cx18_dma_free(struct videobuf_queue *q,
 	struct cx18_stream *s, struct cx18_videobuf_buffer *buf)
 {
 	videobuf_waiton(q, &buf->vb, 0, 0);