diff options
author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
tree | d9523b531156fedb204e31b4612519b0a7a003e7 /drivers/net/tokenring/smctr.c | |
parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
download | linux-next-23e735bc7b0e1d614656881794257b4224efda3a.tar.gz |
Merge ../linus
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
-rw-r--r-- | drivers/net/tokenring/smctr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index cd2e0251e2bc..85a7f797d343 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -5666,7 +5666,7 @@ module_param_array(io, int, NULL, 0); module_param_array(irq, int, NULL, 0); module_param(ringspeed, int, 0); -static struct net_device *setup_card(int n) +static struct net_device * __init setup_card(int n) { struct net_device *dev = alloc_trdev(sizeof(struct net_local)); int err; @@ -5696,9 +5696,8 @@ out: free_netdev(dev); return ERR_PTR(err); } - -int init_module(void) +int __init init_module(void) { int i, found = 0; struct net_device *dev; |