diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 05:47:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 05:47:42 -0300 |
| commit | d1c3ce25c000fa72c7bfb3b42d88bfbe4f5e37fa (patch) | |
| tree | 551d1ce9ed77fcb5b2763cd8f606b46a043de386 /linux/sound | |
| parent | 6324f3b71dfb070913efba2306010ae2e0a1df11 (diff) | |
| parent | e768886b19cdc2ba666bd52faa7797ff4151ced7 (diff) | |
| download | mediapointer-dvb-s2-d1c3ce25c000fa72c7bfb3b42d88bfbe4f5e37fa.tar.gz mediapointer-dvb-s2-d1c3ce25c000fa72c7bfb3b42d88bfbe4f5e37fa.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/i2c/other/tea575x-tuner.c | 4 | ||||
| -rw-r--r-- | linux/sound/oss/btaudio.c | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c index a7fbe18d0..4ac049ad0 100644 --- a/linux/sound/i2c/other/tea575x-tuner.c +++ b/linux/sound/i2c/other/tea575x-tuner.c @@ -167,10 +167,12 @@ static int snd_tea575x_ioctl(struct inode *inode, struct file *file, struct video_audio v; if(copy_from_user(&v, arg, sizeof(v))) return -EFAULT; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) if (tea->ops->mute) tea->ops->mute(tea, (v.flags & VIDEO_AUDIO_MUTE) ? 1 : 0); +#endif if(v.audio) return -EINVAL; return 0; @@ -223,9 +225,11 @@ void snd_tea575x_init(struct snd_tea575x *tea) snd_tea575x_set_freq(tea); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17) /* mute on init */ if (tea->ops->mute) tea->ops->mute(tea, 1); +#endif } #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) 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); |