---

yaml --- r: 24742 b: refs/heads/master c: d1ca6c4 h: refs/heads/master v: v3
git-mirror · Mar 27, 2006 · 56e7636 · 56e7636
1 parent 88736ec
commit 56e7636
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b98f71e2e3facc15e73b7e3ae9516ecb737375
+refs/heads/master: d1ca6c4ff6714826acb1a434e5d3862984eb26d5
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -34,11 +34,10 @@
 #include "bcm43xx_power.h"
 #include "bcm43xx_xmit.h"
 
-#include <linux/dmapool.h>
+#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <asm/semaphore.h>
 
 
 static inline int free_slots(struct bcm43xx_dmaring *ring)

diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -38,6 +38,7 @@
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
+#include <linux/dma-mapping.h>
 #include <net/iw_handler.h>
 
 #include "bcm43xx.h"