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

Commit 2ad657c8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'netdev-2.6.20' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird into tmp

parents ff51a987 c69fda4e

drivers/net/3c501.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ int __init init_module(void) 
 * and then free up the resources we took when the card was found.

 */



void cleanup_module(void)

void __exit cleanup_module(void)

{

	struct net_device *dev = dev_3c501;

	unregister_netdev(dev);

drivers/net/3c503.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static void cleanup_card(struct net_device *dev) 
		iounmap(ei_status.mem);

}



void

void __exit

cleanup_module(void)

{

	int this_dev;

drivers/net/3c505.c

+1 −1
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ int __init init_module(void) 
	return 0;

}



void cleanup_module(void)

void __exit cleanup_module(void)

{

	int this_dev;

drivers/net/3c507.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ int __init init_module(void) 
	return IS_ERR(dev_3c507) ? PTR_ERR(dev_3c507) : 0;

}



void

void __exit

cleanup_module(void)

{

	struct net_device *dev = dev_3c507;

drivers/net/3c523.c

+1 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ int __init init_module(void) 
	} else return 0;

}



void cleanup_module(void)

void __exit cleanup_module(void)

{

	int this_dev;

	for (this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {