diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/char/ip2.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/char/ip2.c')
| -rw-r--r-- | drivers/char/ip2.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/drivers/char/ip2.c b/drivers/char/ip2.c index e9880146a..600aea60a 100644 --- a/drivers/char/ip2.c +++ b/drivers/char/ip2.c @@ -6,11 +6,22 @@ // __initdata should work as advertized // +#include <linux/config.h> #include <linux/module.h> #include <linux/version.h> #include <linux/init.h> #include <linux/wait.h> +#ifndef __init +#define __init +#endif +#ifndef __initfunc +#define __initfunc(a) a +#endif +#ifndef __initdata +#define __initdata +#endif + #include "./ip2/ip2types.h" #include "./ip2/fip_firm.h" // the meat @@ -18,15 +29,24 @@ int ip2_loadmain(int *, int *, unsigned char *, int ); // ref into ip2main.c #ifdef MODULE +#if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS) +# define MODVERSIONS +#endif +#ifdef MODVERSIONS +# include <linux/modversions.h> +#endif + static int io[IP2_MAX_BOARDS]= { 0,}; static int irq[IP2_MAX_BOARDS] = { 0,}; -MODULE_AUTHOR("Doug McNash"); -MODULE_DESCRIPTION("Computone IntelliPort Plus Driver"); -MODULE_PARM(irq,"1-"__MODULE_STRING(IP2_MAX_BOARDS) "i"); -MODULE_PARM_DESC(irq,"Interrupts for IntelliPort Cards"); -MODULE_PARM(io,"1-"__MODULE_STRING(IP2_MAX_BOARDS) "i"); -MODULE_PARM_DESC(io,"I/O ports for IntelliPort Cards"); +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) + MODULE_AUTHOR("Doug McNash"); + MODULE_DESCRIPTION("Computone IntelliPort Plus Driver"); + MODULE_PARM(irq,"1-"__MODULE_STRING(IP2_MAX_BOARDS) "i"); + MODULE_PARM_DESC(irq,"Interrupts for IntelliPort Cards"); + MODULE_PARM(io,"1-"__MODULE_STRING(IP2_MAX_BOARDS) "i"); + MODULE_PARM_DESC(io,"I/O ports for IntelliPort Cards"); +# endif /* LINUX_VERSION */ //====================================================================== |