summaryrefslogtreecommitdiff
path: root/linux/sound
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 10:17:59 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 10:17:59 -0200
commit3f85abb813f1ad7454fb7a2f8e2998373571fe39 (patch)
treecf89a87206ea42719ee69f209d43a704034b2c22 /linux/sound
parentb0ab681e920adac28d099cb1ec192d2ada2c160f (diff)
parentb50e38700408ec0bb073fc56ade123a1305842b6 (diff)
downloadmediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.gz
mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound')
-rw-r--r--linux/sound/i2c/other/tea575x-tuner.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c
index 2d07c8ea5..db47945e9 100644
--- a/linux/sound/i2c/other/tea575x-tuner.c
+++ b/linux/sound/i2c/other/tea575x-tuner.c
@@ -89,7 +89,7 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
* Linux Video interface
*/
-static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
+static long snd_tea575x_ioctl(struct file *file,
unsigned int cmd, unsigned long data)
{
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
@@ -185,7 +185,7 @@ static void snd_tea575x_release(struct video_device *vfd)
{
}
-static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)
+static int snd_tea575x_exclusive_open(struct file *file)
{
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
tea575x_t *tea = video_drvdata(file);
@@ -196,7 +196,7 @@ static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file)
return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0;
}
-static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file)
+static int snd_tea575x_exclusive_release(struct file *file)
{
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
tea575x_t *tea = video_drvdata(file);