aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-07-15 15:19:56 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-07-29 17:22:18 -0300
commit7845701820c420454bcfdc4902fad68901d9ff83 (patch)
tree102fa97abce6565b559d6e62b7400ddbd1e54fdd /drivers/media/video/saa7134/saa7134.h
parentd5fdd1354e04658ea25150cc152a395bb6ecb6da (diff)
V4L/DVB (4310): Saa7134: rename dmasound_{init, exit}
Two different exports with the same name are not a good idea: $ grep -r EXPORT_SYMBOL\(dmasound_init\) * drivers/media/video/saa7134/saa7134-core.c:EXPORT_SYMBOL(dmasound_init); sound/oss/dmasound/dmasound_core.c:EXPORT_SYMBOL(dmasound_init); $ This patch renames the saa7134 dmasound_{init,exit} to saa7134_dmasound_{init,exit}. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index d5ee99c574c..c04ce6152fd 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);
/* ----------------------------------------------------------- */