diff options
| -rw-r--r-- | linux/drivers/media/radio/miropcm20-rds.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvmixer.c | 6 | ||||
| -rw-r--r-- | linux/sound/oss/btaudio.c | 18 |
3 files changed, 24 insertions, 4 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; } diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c index 9aa5f866f..cf10bf82a 100644 --- a/linux/sound/oss/btaudio.c +++ b/linux/sound/oss/btaudio.c @@ -980,7 +980,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, /* register devices */ if (digital) { rc = bta->dsp_digital = - register_sound_dsp(&btaudio_digital_dsp_fops,dsp1); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) + register_sound_dsp(&btaudio_digital_dsp_fops, dsp1); +#else + register_sound_dsp((struct file_operations *)&btaudio_digital_dsp_fops, dsp1); +#endif if (rc < 0) { printk(KERN_WARNING "btaudio: can't register digital dsp (rc=%d)\n",rc); @@ -991,7 +995,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, } if (analog) { rc = bta->dsp_analog = - register_sound_dsp(&btaudio_analog_dsp_fops,dsp2); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) + register_sound_dsp(&btaudio_analog_dsp_fops, dsp2); +#else + register_sound_dsp((struct file_operations *)&btaudio_analog_dsp_fops, dsp2); +#endif if (rc < 0) { printk(KERN_WARNING "btaudio: can't register analog dsp (rc=%d)\n",rc); @@ -999,7 +1007,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, } printk(KERN_INFO "btaudio: registered device dsp%d [analog]\n", bta->dsp_analog >> 4); - rc = bta->mixer_dev = register_sound_mixer(&btaudio_mixer_fops,mixer); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 17) + rc = bta->mixer_dev = register_sound_mixer(&btaudio_mixer_fops, mixer); +#else + rc = bta->mixer_dev = register_sound_mixer((struct file_operations *)&btaudio_mixer_fops, mixer); +#endif if (rc < 0) { printk(KERN_WARNING "btaudio: can't register mixer (rc=%d)\n",rc); |