diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/tokenring/smctr.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
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 cd2e0251e2..85a7f797d3 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -5666,7 +5666,7 @@ module_param_array(io, int, NULL, 0); | |||
| 5666 | module_param_array(irq, int, NULL, 0); | 5666 | module_param_array(irq, int, NULL, 0); |
| 5667 | module_param(ringspeed, int, 0); | 5667 | module_param(ringspeed, int, 0); |
| 5668 | 5668 | ||
| 5669 | static struct net_device *setup_card(int n) | 5669 | static struct net_device * __init setup_card(int n) |
| 5670 | { | 5670 | { |
| 5671 | struct net_device *dev = alloc_trdev(sizeof(struct net_local)); | 5671 | struct net_device *dev = alloc_trdev(sizeof(struct net_local)); |
| 5672 | int err; | 5672 | int err; |
| @@ -5696,9 +5696,8 @@ out: | |||
| 5696 | free_netdev(dev); | 5696 | free_netdev(dev); |
| 5697 | return ERR_PTR(err); | 5697 | return ERR_PTR(err); |
| 5698 | } | 5698 | } |
| 5699 | |||
| 5700 | 5699 | ||
| 5701 | int init_module(void) | 5700 | int __init init_module(void) |
| 5702 | { | 5701 | { |
| 5703 | int i, found = 0; | 5702 | int i, found = 0; |
| 5704 | struct net_device *dev; | 5703 | struct net_device *dev; |