From: ppisa Date: Mon, 10 Jul 2006 22:27:00 +0000 (+0200) Subject: Merge: Do not use new module parameters declaration for old 2.6.x kernels. X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/db38043bcb87da9915f71616df94f3bb86355a0f?hp=803522f9977df3a95047830cfc7d21089ae7d238 Merge: Do not use new module parameters declaration for old 2.6.x kernels. Merge commit 'remotes/sf-ocera-lincan/master' --- diff --git a/lincan/src/main.c b/lincan/src/main.c index 2a55355..274d573 100644 --- a/lincan/src/main.c +++ b/lincan/src/main.c @@ -97,7 +97,7 @@ unsigned int irq_specified; unsigned int io_specified; unsigned int clockfreq_specified; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)) /* Module parameters, some must be supplied at module loading time */ MODULE_PARM(major,"1i"); /*MODULE_PARM(minor, "1-" __MODULE_STRING(MAX_TOT_CHIPS)"i");*/ @@ -114,7 +114,7 @@ MODULE_PARM(extmask, "1i"); MODULE_PARM(mo15mask, "1i"); MODULE_PARM(processlocal, "1i"); -#else /* LINUX_VERSION_CODE >= 2,6,0 */ +#else /* LINUX_VERSION_CODE >= 2,6,12 */ module_param(major, int, 0); module_param_array(minor, int, &minor_specified, 0); module_param(extended, int, 0); @@ -128,7 +128,7 @@ module_param(stdmask, int, 0); module_param(extmask, int, 0); module_param(mo15mask, int, 0); module_param(processlocal, int, 0); -#endif /* LINUX_VERSION_CODE >= 2,6,0 */ +#endif /* LINUX_VERSION_CODE >= 2,6,12 */ MODULE_PARM_DESC(major,"can be used to change default major [" __MODULE_STRING(CAN_MAJOR) "]"); MODULE_PARM_DESC(minor,"can be used to change default starting minor for each channel");