diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 22:12:24 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 22:12:24 +0200 |
| commit | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (patch) | |
| tree | d943fdb68114edcf67223659764ef458860eebbd | |
| parent | Merge branch 'from-linus' into upstream (diff) | |
| parent | [PATCH] arlan: fix section mismatch warnings (diff) | |
| download | linux-b1141f6d5dead296adcabd4a1e8ea2b994e287cb.tar.xz linux-b1141f6d5dead296adcabd4a1e8ea2b994e287cb.zip | |
Merge branch 'upstream-fixes' into upstream
| -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; |