diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/net/wireless/bcm43xx | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/wireless/bcm43xx')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index 6961be682c9d..7b665e2386a8 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <net/ieee80211softmac.h> | 33 | #include <net/ieee80211softmac.h> |
| 34 | #include <net/ieee80211softmac_wx.h> | 34 | #include <net/ieee80211softmac_wx.h> |
| 35 | #include <linux/capability.h> | 35 | #include <linux/capability.h> |
| 36 | #include <linux/sched.h> /* for capable() */ | ||
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | 37 | ||
| 39 | #include "bcm43xx.h" | 38 | #include "bcm43xx.h" |