diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-oss.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index 629ad73be..2ceb1c4c6 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-oss.c,v 1.25 2005/11/09 19:36:11 rmcc Exp $ + * $Id: saa7134-oss.c,v 1.26 2005/11/09 21:54:53 nsh Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/slab.h> +#include <linux/interrupt.h> #include <linux/sound.h> #include <linux/soundcard.h> @@ -49,11 +50,20 @@ MODULE_PARM_DESC(rate,"sample rate (valid are: 32000,48000)"); static unsigned int dsp_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; MODULE_PARM_DESC(dsp_nr, "device numbers for SAA7134 capture interface(s)."); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static int dummy; +module_param_array(dsp_nr, int, dummy, 0444); +#else module_param_array(dsp_nr, int, NULL, 0444); +#endif static unsigned int mixer_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; MODULE_PARM_DESC(mixer_nr, "mixer numbers for SAA7134 capture interface(s)."); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +module_param_array(mixer_nr, int, dummy, 0444); +#else module_param_array(mixer_nr, int, NULL, 0444); +#endif #define dprintk(fmt, arg...) if (debug) \ printk(KERN_DEBUG "%s/oss: " fmt, dev->name , ## arg) @@ -907,7 +917,7 @@ int saa7134_dsp_create(struct saa7134_dev *dev) err = dev->dmasound.minor_dsp = register_sound_dsp(&saa7134_dsp_fops, - dsp_nr[dev->nr]); + dsp_nr[dev->nr]); if (err < 0) { goto fail; } @@ -916,7 +926,7 @@ int saa7134_dsp_create(struct saa7134_dev *dev) err = dev->dmasound.minor_mixer = register_sound_mixer(&saa7134_mixer_fops, - mixer_nr[dev->nr]); + mixer_nr[dev->nr]); if (err < 0) goto fail; printk(KERN_INFO "%s: registered device mixer%d\n", |