diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 09:35:27 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 09:35:27 -0200 |
commit | c036738278216aac0276743b0eb1e88e5cfd1f25 (patch) | |
tree | 3415ee49f4624d59d60d3b39e0745315a8366426 /linux/sound/i2c/other/tea575x-tuner.c | |
parent | fc7012444ff33c182360e0bade20bd56e2a42631 (diff) | |
parent | 70e0ec035b78cab8338a5b20518bfc1d1307b7ad (diff) | |
download | mediapointer-dvb-s2-c036738278216aac0276743b0eb1e88e5cfd1f25.tar.gz mediapointer-dvb-s2-c036738278216aac0276743b0eb1e88e5cfd1f25.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/tiger
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/sound/i2c/other/tea575x-tuner.c')
-rw-r--r-- | linux/sound/i2c/other/tea575x-tuner.c | 6 |
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); |