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/arcnet | |
parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
download | kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.zip kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.tar.gz kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.tar.bz2 |
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/arcnet')
-rw-r--r-- | drivers/net/arcnet/com20020.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 7cf0a25..8b51313 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c @@ -348,14 +348,15 @@ MODULE_LICENSE("GPL"); #ifdef MODULE -int init_module(void) +static int __init com20020_module_init(void) { BUGLVL(D_NORMAL) printk(VERSION); return 0; } -void cleanup_module(void) +static void __exit com20020_module_exit(void) { } - +module_init(com20020_module_init); +module_exit(com20020_module_exit); #endif /* MODULE */ |