diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-15 15:19:56 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-15 15:19:56 -0300 |
commit | ba213cd103289d2fcbf4c67079db98faad9e6f50 (patch) | |
tree | 698d4a767d6e89e6f9296fd57012e684171adcb0 /linux/drivers/media/video/saa7134/saa7134.h | |
parent | bdf2ac45dff1a1370cbf142f0bf66fbc992adf67 (diff) | |
download | mediapointer-dvb-s2-ba213cd103289d2fcbf4c67079db98faad9e6f50.tar.gz mediapointer-dvb-s2-ba213cd103289d2fcbf4c67079db98faad9e6f50.tar.bz2 |
Saa7134: rename dmasound_{init, exit}
From: Adrian Bunk <bunk@stusta.de>
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 'linux/drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index f056e2ed6..b5eed7a9e 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -612,8 +612,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); /* ----------------------------------------------------------- */ |