4 files changed, 20 insertions, 20 deletions

diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index f1fd69e7f119..d73cff1970ae 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -997,9 +997,9 @@ static int saa7134_alsa_init(void)
         struct saa7134_dev *dev = NULL;
         struct list_head *list;
 
-        if (!dmasound_init && !dmasound_exit) {
-                dmasound_init = alsa_device_init;
-                dmasound_exit = alsa_device_exit;
+        if (!saa7134_dmasound_init && !saa7134_dmasound_exit) {
+                saa7134_dmasound_init = alsa_device_init;
+                saa7134_dmasound_exit = alsa_device_exit;
         } else {
                 printk(KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n");
                 return -EBUSY;
@@ -1036,8 +1036,8 @@ static void saa7134_alsa_exit(void)
                 snd_card_free(snd_saa7134_cards[idx]);
         }
 
-        dmasound_init = NULL;
-        dmasound_exit = NULL;
+        saa7134_dmasound_init = NULL;
+        saa7134_dmasound_exit = NULL;
         printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
 
         return;
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 6e97cc84ba89..be3a81fc90a2 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -95,8 +95,8 @@ LIST_HEAD(saa7134_devlist);
 static LIST_HEAD(mops_list);
 static unsigned int saa7134_devcount;
 
-int (*dmasound_init)(struct saa7134_dev *dev);
-int (*dmasound_exit)(struct saa7134_dev *dev);
+int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
+int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 
 #define dprintk(fmt, arg...)    if (core_debug) \
         printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg)
@@ -1008,8 +1008,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         /* check for signal */
         saa7134_irq_video_intl(dev);
 
-        if (dmasound_init && !dev->dmasound.priv_data) {
-                dmasound_init(dev);
+        if (saa7134_dmasound_init && !dev->dmasound.priv_data) {
+                saa7134_dmasound_init(dev);
         }
 
         return 0;
@@ -1036,8 +1036,8 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
         struct saa7134_mpeg_ops *mops;
 
         /* Release DMA sound modules if present */
-        if (dmasound_exit && dev->dmasound.priv_data) {
-                dmasound_exit(dev);
+        if (saa7134_dmasound_exit && dev->dmasound.priv_data) {
+                saa7134_dmasound_exit(dev);
         }
 
         /* debugging ... */
@@ -1169,8 +1169,8 @@ EXPORT_SYMBOL(saa7134_boards);
 
 /* ----------------- for the DMA sound modules --------------- */
 
-EXPORT_SYMBOL(dmasound_init);
-EXPORT_SYMBOL(dmasound_exit);
+EXPORT_SYMBOL(saa7134_dmasound_init);
+EXPORT_SYMBOL(saa7134_dmasound_exit);
 EXPORT_SYMBOL(saa7134_pgtable_free);
 EXPORT_SYMBOL(saa7134_pgtable_build);
 EXPORT_SYMBOL(saa7134_pgtable_alloc);
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 3895d05804ae..2e3ba5f31453 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -993,9 +993,9 @@ static int saa7134_oss_init(void)
         struct saa7134_dev *dev = NULL;
         struct list_head *list;
 
-        if (!dmasound_init && !dmasound_exit) {
-                dmasound_init = oss_device_init;
-                dmasound_exit = oss_device_exit;
+        if (!saa7134_dmasound_init && !saa7134_dmasound_exit) {
+                saa7134_dmasound_init = oss_device_init;
+                saa7134_dmasound_exit = oss_device_exit;
         } else {
                 printk(KERN_WARNING "saa7134 OSS: can't load, DMA sound handler already assigned (probably to ALSA)\n");
                 return -EBUSY;
@@ -1037,8 +1037,8 @@ static void saa7134_oss_exit(void)
 
         }
 
-        dmasound_init = NULL;
-        dmasound_exit = NULL;
+        saa7134_dmasound_init = NULL;
+        saa7134_dmasound_exit = NULL;
 
         printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index d5ee99c574cc..c04ce6152fd5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -586,8 +586,8 @@ void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf);
 
 int saa7134_set_dmabits(struct saa7134_dev *dev);
 
-extern int (*dmasound_init)(struct saa7134_dev *dev);
-extern int (*dmasound_exit)(struct saa7134_dev *dev);
+extern int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
+extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 
 
 /* ----------------------------------------------------------- */