From 500c59b431256f91f87b8c82dfa13982d08fc780 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Mon, 25 Oct 2004 11:26:35 +0000 Subject: - new saa7134 card by Nickolay V. Shmyrev - misc stuff --- linux/drivers/media/video/cx88/cx88-core.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'linux/drivers/media/video/cx88/cx88-core.c') diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 5673286c2..36169c106 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.14 2004/10/13 10:39:00 kraxel Exp $ + * $Id: cx88-core.c,v 1.15 2004/10/25 11:26:36 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -50,13 +50,18 @@ module_param(latency,int,0444); MODULE_PARM_DESC(latency,"pci latency timer"); static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static int tuner_num; -module_param_array(tuner,int,tuner_num,0444); -MODULE_PARM_DESC(tuner,"tuner type"); +static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static int card_num; -module_param_array(card,int,card_num,0444); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static int dummy; +module_param_array(tuner, int, dummy, 0444); +module_param_array(card, int, dummy, 0444); +#else +module_param_array(tuner, int, NULL, 0444); +module_param_array(card, int, NULL, 0444); +#endif + +MODULE_PARM_DESC(tuner,"tuner type"); MODULE_PARM_DESC(card,"card type"); static unsigned int nicam = 0; -- cgit v1.2.3