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/sound | |
| 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/sound')
| -rw-r--r-- | linux/sound/oss/btaudio.c | 18 |
1 files changed, 15 insertions, 3 deletions
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); |