Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
This commit is contained in:
commit
8fc29ba65b
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue