diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-10 01:43:25 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-10 01:43:25 +0000 |
| commit | f925c632b4f136d1d154174041f6b322149e3682 (patch) | |
| tree | 2e3f52ce73a9ca78c5bb7a606e4a2885963f7659 /linux/drivers/media/video/saa7134/saa7134-oss.c | |
| parent | ac63d03ba48d965f169ed2595ecc2ad7b8694e95 (diff) | |
| download | mediapointer-dvb-s2-f925c632b4f136d1d154174041f6b322149e3682.tar.gz mediapointer-dvb-s2-f925c632b4f136d1d154174041f6b322149e3682.tar.bz2 | |
make tree to compile against kernel 2.5.31
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-oss.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index beab9a86a..a2df1dff7 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.30 2005/12/07 12:30:28 mchehab Exp $ + * $Id: saa7134-oss.c,v 1.31 2005/12/10 01:43:26 mchehab Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -50,8 +50,12 @@ 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) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) +MODULE_PARM(dsp_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +#else static int dummy; module_param_array(dsp_nr, int, dummy, 0444); +#endif #else module_param_array(dsp_nr, int, NULL, 0444); #endif @@ -59,7 +63,11 @@ module_param_array(dsp_nr, int, NULL, 0444); 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) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) +MODULE_PARM(mixer_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +#else module_param_array(mixer_nr, int, dummy, 0444); +#endif #else module_param_array(mixer_nr, int, NULL, 0444); #endif @@ -957,7 +965,11 @@ static int oss_device_exit(struct saa7134_dev *dev) saa7134_oss_fini(dev); if (dev->pci->irq > 0) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) synchronize_irq(dev->pci->irq); +#else + synchronize_irq(); +#endif free_irq(dev->pci->irq,&dev->dmasound); } |