diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce /drivers/net/atarilance.c | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 13c293b286de..4cceaac8863a 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c @@ -1155,7 +1155,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr ) #ifdef MODULE static struct net_device *atarilance_dev; -int __init init_module(void) +static int __init atarilance_module_init(void) { atarilance_dev = atarilance_probe(-1); if (IS_ERR(atarilance_dev)) @@ -1163,13 +1163,14 @@ int __init init_module(void) return 0; } -void __exit cleanup_module(void) +static void __exit atarilance_module_exit(void) { unregister_netdev(atarilance_dev); free_irq(atarilance_dev->irq, atarilance_dev); free_netdev(atarilance_dev); } - +module_init(atarilance_module_init); +module_exit(atarilance_module_exit); #endif /* MODULE */ |