From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Wed, 12 Jul 2006 16:52:00 +0000 (+0200)
Subject: Merge: Changed kernel version to switch to new module parameters made consistent... 
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/f7b2af6ead019a96396a0f862a5b69c92260ff63?hp=db38043bcb87da9915f71616df94f3bb86355a0f

Merge: Changed kernel version to switch to new module parameters made consistent with value in "main.c".

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/src/tscan1.c b/lincan/src/tscan1.c
index a48a93e..e799097 100644
--- a/lincan/src/tscan1.c
+++ b/lincan/src/tscan1.c
@@ -35,13 +35,13 @@ int tsxxx_base=TS7XXX_IO8_BASE;
 unsigned long tsxxx_base=0;
 #endif /*TS7XXX_IO8_BASE*/
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12))
 MODULE_PARM(tscanio, "1-" __MODULE_STRING(MAX_HW_CARDS)"i");
 MODULE_PARM(tsxxx_base, "1i");
-#else /* LINUX_VERSION_CODE >= 2,6,0 */
+#else /* LINUX_VERSION_CODE >= 2,6,12 */
 module_param_array(tscanio, int, &tscanio_specified, 0);
 module_param(tsxxx_base, ulong, 0);
-#endif /* LINUX_VERSION_CODE >= 2,6,0 */
+#endif /* LINUX_VERSION_CODE >= 2,6,12 */
 
 MODULE_PARM_DESC(tscanio,"TSCAN CAN controller IO address for each board");
 MODULE_PARM_DESC(tsxxx_base,"The base of the ISA/8-bit IO space for TSxxx CAN peripherals in the system");