- #elsif removed, since it breaks gentree stuff.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

10 files changed, 42 insertions, 18 deletions

diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 9af2034fe..4996d9ff1 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-cards.c,v 1.98 2005/10/31 13:39:36 rmcc Exp $
+    $Id: bttv-cards.c,v 1.99 2005/11/06 17:01:47 mchehab Exp $
 
     bttv-cards.c
 
@@ -132,7 +132,8 @@ MODULE_PARM(tuner,"1-" __stringify(BTTV_MAX) "i");
 MODULE_PARM(svhs,"1-" __stringify(BTTV_MAX) "i");
 MODULE_PARM(remote,"1-" __stringify(BTTV_MAX) "i");
 MODULE_PARM(audiomux,"1-" __stringify(BTTV_MAX) "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(card,     int, dummy, 0444);
 module_param_array(pll,      int, dummy, 0444);
@@ -148,6 +149,7 @@ module_param_array(svhs,     int, NULL, 0444);
 module_param_array(remote,   int, NULL, 0444);
 module_param_array(audiomux, int, NULL, 0444);
 #endif
+#endif
 
 MODULE_PARM_DESC(triton1,"set ETBF pci config bit "
 		 "[enable bug compatibility for triton1 + others]");
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index dcdcd4ebf..32c87422b 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.64 2005/10/16 12:13:58 mchehab Exp $
+    $Id: bttv-driver.c,v 1.65 2005/11/06 17:01:47 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -122,12 +122,14 @@ module_param(coring,            int, 0444);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 MODULE_PARM(radio,"1-" __stringify(BTTV_MAX) "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(radio, int, dummy, 0444);
 #else
 module_param_array(radio, int, NULL, 0444);
 #endif
+#endif
 
 MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)");
 MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian");
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index b6937ea73..1b2d591d0 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.46 2005/10/16 12:34:29 mchehab Exp $
+ * $Id: cx88-core.c,v 1.47 2005/11/06 17:01:47 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -59,7 +59,8 @@ static unsigned int card[]  = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 MODULE_PARM(tuner,"1-" __stringify(CX88_MAXBOARDS) "i");
 MODULE_PARM(radiox,"1-" __stringify(CX88_MAXBOARDS) "i");
 MODULE_PARM(card,"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 int dummy;
 module_param_array(tuner, int, dummy, 0444);
 module_param_array(radio, int, dummy, 0444);
@@ -69,6 +70,7 @@ module_param_array(tuner, int, NULL, 0444);
 module_param_array(radio, int, NULL, 0444);
 module_param_array(card,  int, NULL, 0444);
 #endif
+#endif
 
 MODULE_PARM_DESC(tuner,"tuner type");
 MODULE_PARM_DESC(radio,"radio tuner type");
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");
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index da91cf83a..890ed2715 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -62,7 +62,8 @@ MODULE_PARM(card,"1-" __stringify(EM28XX_MAXBOARDS) "i");
 #if 0
 MODULE_PARM(video_nr,"1-" __stringify(EM28XX_MAXBOARDS) "i");
 #endif
-#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(card,  int, dummy, 0444);
 #if 0
@@ -74,6 +75,7 @@ module_param_array(card,  int, NULL, 0444);
 module_param_array(video_nr, int, dummy, 0444);
 #endif
 #endif
+#endif
 MODULE_PARM_DESC(card,"card type");
 #if 0
 MODULE_PARM_DESC(video_nr,"video device numbers");
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index cc0c3caf8..1f5f50a05 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1591,9 +1591,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_suspend(struct device * dev, u32 state, u32 level);
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_resume(struct device * dev, u32 level);
 #endif
@@ -2259,9 +2261,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_suspend(struct device * dev, u32 state, u32 level)
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 {
 	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index cc0c3caf8..1f5f50a05 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1591,9 +1591,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_suspend(struct device * dev, u32 state, u32 level);
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_resume(struct device * dev, u32 level);
 #endif
@@ -2259,9 +2261,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int msp_suspend(struct device * dev, u32 state, u32 level)
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 {
 	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
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;
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 98e5657d6..ca76ad9c9 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -834,9 +834,11 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
 static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
-#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
+#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 static int tda9887_suspend(struct device * dev, u32 state, u32 level)
 #endif
+#endif
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 {
 	struct i2c_client *c = container_of(dev, struct i2c_client, dev);