diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:26:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:26:22 -0400 |
| commit | 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 (patch) | |
| tree | 583f1fe4d46e19fe010ec50776191d7646b05f88 /drivers/net | |
| parent | ecd68853b852cdafb138f9c437f3a751fe7dc381 (diff) | |
| parent | 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/arlan-main.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/wavelan.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index 0e1ac338cac1..bed6823d9809 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c @@ -1838,7 +1838,7 @@ struct net_device * __init arlan_probe(int unit) } #ifdef MODULE -int init_module(void) +int __init init_module(void) { int i = 0; @@ -1860,7 +1860,7 @@ int init_module(void) } -void cleanup_module(void) +void __exit cleanup_module(void) { int i = 0; struct net_device *dev; diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index ff192e96268a..dade4b903579 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c @@ -4306,7 +4306,7 @@ out: * Insertion of the module * I'm now quite proud of the multi-device support. */ -int init_module(void) +int __init init_module(void) { int ret = -EIO; /* Return error if no cards found */ int i; |