summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-empress.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-empress.c6
1 files changed, 4 insertions, 2 deletions
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;