Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c
2009-02-07 02:52:44 -08:00
parent 593721833d 0b492fce3d
commit 409f0a9014
14 changed files with 180 additions and 90 deletions
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1105,7 +1105,7 @@ int dev_open(struct net_device *dev)
 		/*
 		 *	Enable NET_DMA
 		 */
-		dmaengine_get();
+		net_dmaengine_get();

 		/*
 		 *	Initialize multicasting status
@@ -1187,7 +1187,7 @@ int dev_close(struct net_device *dev)
 	/*
 	 *	Shutdown NET_DMA
 	 */
-	dmaengine_put();
+	net_dmaengine_put();

 	return 0;
 }