diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/ni52.c | |
parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
download | op-kernel-dev-846050dd49719b1f68248807bba5c27bfc86f81a.zip op-kernel-dev-846050dd49719b1f68248807bba5c27bfc86f81a.tar.gz |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/ni52.c')
-rw-r--r-- | drivers/net/ni52.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index fa854c8..4d52ecf 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c @@ -1323,7 +1323,7 @@ MODULE_PARM_DESC(irq, "NI5210 IRQ number,required"); MODULE_PARM_DESC(memstart, "NI5210 memory base address,required"); MODULE_PARM_DESC(memend, "NI5210 memory end address,required"); -int init_module(void) +int __init init_module(void) { if(io <= 0x0 || !memend || !memstart || irq < 2) { printk("ni52: Autoprobing not allowed for modules.\nni52: Set symbols 'io' 'irq' 'memstart' and 'memend'\n"); |