Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc29ba6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents ecd68853 4541a5db

drivers/net/wireless/arlan-main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

drivers/net/wireless/wavelan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4306,7 +4306,7 @@ struct net_device * __init wavelan_probe(int unit) 
 * 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;