aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c7
-rw-r--r--drivers/media/video/saa7134/saa7134-oss.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 32a1f3ec4410..263c6e2e3e8e 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -138,7 +138,8 @@ static void saa7134_dma_start(struct saa7134_dev *dev)
138 * 138 *
139 */ 139 */
140 140
141void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status) 141static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
142 unsigned long status)
142{ 143{
143 int next_blk, reg = 0; 144 int next_blk, reg = 0;
144 145
@@ -879,7 +880,7 @@ static void snd_saa7134_free(snd_card_t * card)
879 * 880 *
880 */ 881 */
881 882
882int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) 883static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
883{ 884{
884 885
885 snd_card_t *card; 886 snd_card_t *card;
@@ -1009,7 +1010,7 @@ static int saa7134_alsa_init(void)
1009 * Module destructor 1010 * Module destructor
1010 */ 1011 */
1011 1012
1012void saa7134_alsa_exit(void) 1013static void saa7134_alsa_exit(void)
1013{ 1014{
1014 int idx; 1015 int idx;
1015 1016
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 299046974382..5a579194e455 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -899,7 +899,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status)
899 spin_unlock(&dev->slock); 899 spin_unlock(&dev->slock);
900} 900}
901 901
902int saa7134_dsp_create(struct saa7134_dev *dev) 902static int saa7134_dsp_create(struct saa7134_dev *dev)
903{ 903{
904 int err; 904 int err;
905 905
@@ -981,7 +981,7 @@ static int saa7134_oss_init(void)
981 981
982} 982}
983 983
984void saa7134_oss_exit(void) 984static void saa7134_oss_exit(void)
985{ 985{
986 struct saa7134_dev *dev = NULL; 986 struct saa7134_dev *dev = NULL;
987 struct list_head *list; 987 struct list_head *list;