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

Commit 0a01707b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (43 commits)
  [wireless] zd1211rw: workqueue-related build fixes
  [netdrvr] netxen: workqueue-related build fixes
  [PATCH] sky2: sparse warnings
  [PATCH] skge: fix sparse warnings
  [PATCH] myri10ge: write as 2 32-byte blocks in myri10ge_submit_8rx
  [PATCH] sky2: receive queue watermark tweak
  [PATCH] sky2: beter ram buffer partitioning
  [PATCH] sky2: add comments to PCI ids
  [PATCH] sky2: add PCI for 88ec033
  [PATCH] AT91RM9200 Ethernet: Use dev_alloc_skb()
  [PATCH] AT91RM9200 Ethernet: Add netpoll / netconsole support
  [PATCH] AT91RM9200 Ethernet: Move check_timer variable and use mod_timer()
  [PATCH] AT91RM9200 Ethernet: Remove 'at91_dev' and use netdev_priv()
  [PATCH] ipw2200: Fix debug output endian issue
  [PATCH] ipw2200: Fix a typo
  [PATCH] ipw2200: Update version stamp to 1.2.0
  [PATCH] ipw2200: Add IEEE80211_RADIOTAP_TSFT for promiscuous mode
  [PATCH] softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
  [PATCH] softmac: Fixed handling of deassociation from AP
  [PATCH] ipw2200: replace kmalloc+memset with kcalloc
  ...
parents 2685b267 0ae85135

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++) {