lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-fixes' into upstream

Browse Source
This commit is contained in:
John W. Linville
2006-05-26 16:12:24 -04:00
parent f587fb74b2 4541a5db0b
commit b1141f6d5d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/arlan-main.c
View File

@@ -1838,7 +1838,7 @@ struct net_device * __init arlan_probe(int unit)
} }
#ifdef MODULE #ifdef MODULE
int init_module(void) int __init init_module(void)
{ {
int i = 0; int i = 0;
@@ -1860,7 +1860,7 @@ int init_module(void)
} }
void cleanup_module(void) void __exit cleanup_module(void)
{ {
int i = 0; int i = 0;
struct net_device *dev; struct net_device *dev;

2
drivers/net/wireless/wavelan.c
View File

@@ -4306,7 +4306,7 @@ out:
* Insertion of the module * Insertion of the module
* I'm now quite proud of the multi-device support. * 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 ret = -EIO; /* Return error if no cards found */
int i; int i;