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/at1700.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/at1700.c')
| -rw-r--r-- | drivers/net/at1700.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 24d81f92253..7e874d485d2 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c @@ -881,7 +881,7 @@ MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address"); MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number"); MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)"); -int __init init_module(void) +static int __init at1700_module_init(void) { if (io == 0) printk("at1700: You should not use auto-probing with insmod!\n"); @@ -891,13 +891,14 @@ int __init init_module(void) return 0; } -void __exit -cleanup_module(void) +static void __exit at1700_module_exit(void) { unregister_netdev(dev_at1700); cleanup_card(dev_at1700); free_netdev(dev_at1700); } +module_init(at1700_module_init); +module_exit(at1700_module_exit); #endif /* MODULE */ MODULE_LICENSE("GPL"); |