aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-03-25 15:43:18 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:19:45 -0500
commitd1ca6c4ff6714826acb1a434e5d3862984eb26d5 (patch)
treeb54f355a8569ad1e4a41b914876d02a22d321152 /drivers/net
parent04b98f71e2e3facc15e73b7e3ae9516ecb737375 (diff)
downloadkernel_samsung_espresso10-d1ca6c4ff6714826acb1a434e5d3862984eb26d5.zip
kernel_samsung_espresso10-d1ca6c4ff6714826acb1a434e5d3862984eb26d5.tar.gz
kernel_samsung_espresso10-d1ca6c4ff6714826acb1a434e5d3862984eb26d5.tar.bz2
[PATCH] bcm43xx: fix "include" issues on some platforms.
Signed-off-by: Michael Buesch <mbuesch@freenet.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_dma.c3
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index 18928ac..bad5374 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/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/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 281db64..29df4f8 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/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"