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/cx88/cx88-video.c | |
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/cx88/cx88-video.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 0867b33a6..44fb4e671 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.99 2005/10/18 21:49:21 nsh Exp $ + * $Id: cx88-video.c,v 1.100 2005/11/06 17:01:47 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -57,7 +57,8 @@ static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; MODULE_PARM(video_nr,"1-" __stringify(CX88_MAXBOARDS) "i"); MODULE_PARM(vbi_nr,"1-" __stringify(CX88_MAXBOARDS) "i"); MODULE_PARM(radio_nr,"1-" __stringify(CX88_MAXBOARDS) "i"); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +#else +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) static unsigned int dummy; module_param_array(video_nr, int, dummy, 0444); module_param_array(vbi_nr, int, dummy, 0444); @@ -67,6 +68,7 @@ module_param_array(video_nr, int, NULL, 0444); module_param_array(vbi_nr, int, NULL, 0444); module_param_array(radio_nr, int, NULL, 0444); #endif +#endif MODULE_PARM_DESC(video_nr,"video device numbers"); MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); |