diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 19:37:10 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 19:37:10 +0200 |
| commit | 7916505c8d60e3616b033889debffd5fb280780f (patch) | |
| tree | 21bf70e56de0b8e9b5b85832738864066b451d5f /linux/drivers | |
| parent | ad2b972483262f7b5865dbfc824303de2c82b3aa (diff) | |
| download | mediapointer-dvb-s2-7916505c8d60e3616b033889debffd5fb280780f.tar.gz mediapointer-dvb-s2-7916505c8d60e3616b033889debffd5fb280780f.tar.bz2 | |
btaudio/tvmixer/miropcm20-rds: fix 2.6.16 compilation
From: Hans Verkuil <hverkuil@xs4all.nl>
Missed a few warnings, this patch fixes them.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/radio/miropcm20-rds.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvmixer.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/radio/miropcm20-rds.c b/linux/drivers/media/radio/miropcm20-rds.c index 06dfed9ef..295381795 100644 --- a/linux/drivers/media/radio/miropcm20-rds.c +++ b/linux/drivers/media/radio/miropcm20-rds.c @@ -104,7 +104,11 @@ static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length, } } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) static const struct file_operations rds_fops = { +#else +static struct file_operations rds_fops = { +#endif .owner = THIS_MODULE, .read = rds_f_read, .open = rds_f_open, diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index b50e0942e..d7b931fd3 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -286,7 +286,11 @@ static int tvmixer_clients(struct i2c_client *client) return -1; /* everything is fine, register */ - if ((minor = register_sound_mixer(&tvmixer_fops,devnr)) < 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) + if ((minor = register_sound_mixer(&tvmixer_fops, devnr)) < 0) { +#else + if ((minor = register_sound_mixer((struct file_operations *)&tvmixer_fops, devnr)) < 0) { +#endif printk(KERN_ERR "tvmixer: cannot allocate mixer device\n"); return -1; } |