diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-06 17:01:47 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-06 17:01:47 +0000 |
| commit | 67955ab4a9237e2875812740168d105b0989a17d (patch) | |
| tree | 7166e6bf0bbc91cc8427e3f7747b462a6aeb4889 /linux/drivers/media/video/saa7134 | |
| parent | fbe7d42cc40bee7179ab9ba05959b2b3374acf08 (diff) | |
| download | mediapointer-dvb-s2-67955ab4a9237e2875812740168d105b0989a17d.tar.gz mediapointer-dvb-s2-67955ab4a9237e2875812740168d105b0989a17d.tar.bz2 | |
- #elsif removed, since it breaks gentree stuff.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index c5664af9e..63a5f52c3 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.47 2005/11/05 02:49:20 rmcc Exp $ + * $Id: saa7134-core.c,v 1.48 2005/11/06 17:01:47 mchehab Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -84,7 +84,8 @@ MODULE_PARM(dsp_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); MODULE_PARM(mixer_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); MODULE_PARM(tuner_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); MODULE_PARM(card,"1-" __stringify(SAA7134_MAXBOARDS) "i"); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +#else +#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); @@ -102,6 +103,7 @@ module_param_array(mixer_nr, int, NULL, 0444); module_param_array(tuner, int, NULL, 0444); module_param_array(card, int, NULL, 0444); #endif +#endif MODULE_PARM_DESC(video_nr, "video device number"); MODULE_PARM_DESC(vbi_nr, "vbi device number"); diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 69da5181a..d3b7a1862 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-empress.c,v 1.14 2005/10/16 12:13:58 mchehab Exp $ + * $Id: saa7134-empress.c,v 1.15 2005/11/06 17:01:47 mchehab Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -41,12 +41,14 @@ static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) MODULE_PARM(empress_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) static int dummy; module_param_array(empress_nr, int, dummy, 0444); #else module_param_array(empress_nr, int, NULL, 0444); #endif +#endif MODULE_PARM_DESC(empress_nr,"ts device number"); static unsigned int debug = 0; |