diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-09 11:34:59 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-09 11:34:59 +0000 |
| commit | 8fefc4d0918a1a9a7af142725963dc3c93cdab2a (patch) | |
| tree | a25f3ebaceb27166d25fab47abbb9d2b91ecd5d0 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | 6a9fd7b88d365d8686adb88e32cf2bf056d63a08 (diff) | |
| download | mediapointer-dvb-s2-8fefc4d0918a1a9a7af142725963dc3c93cdab2a.tar.gz mediapointer-dvb-s2-8fefc4d0918a1a9a7af142725963dc3c93cdab2a.tar.bz2 | |
- avermedia fixes (by Nickolay V. Shmyrev).
- make it build on non-cutting edge kernels (i.e. 2.6.9 ;)
- convert remaining modules to new-style insmod options.
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 05b63cbed..d3c79cd35 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.15 2004/11/07 14:44:59 kraxel Exp $ + * $Id: saa7134-core.c,v 1.16 2004/11/09 11:34:59 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -68,6 +68,16 @@ static unsigned int mixer_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static int dummy; +module_param_array(video_nr, int, dummy, 0444); +module_param_array(vbi_nr, int, dummy, 0444); +module_param_array(radio_nr, int, dummy, 0444); +module_param_array(dsp_nr, int, dummy, 0444); +module_param_array(mixer_nr, int, dummy, 0444); +module_param_array(tuner, int, dummy, 0444); +module_param_array(card, int, dummy, 0444); +#else module_param_array(video_nr, int, NULL, 0444); module_param_array(vbi_nr, int, NULL, 0444); module_param_array(radio_nr, int, NULL, 0444); @@ -75,6 +85,7 @@ module_param_array(dsp_nr, int, NULL, 0444); module_param_array(mixer_nr, int, NULL, 0444); module_param_array(tuner, int, NULL, 0444); module_param_array(card, int, NULL, 0444); +#endif MODULE_PARM_DESC(video_nr, "video device number"); MODULE_PARM_DESC(vbi_nr, "vbi device number"); |