summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_chip.c
diff options
context:
space:
mode:
authorDavid S. Miller2008-09-20 01:17:12 +0200
committerDavid S. Miller2008-09-20 01:17:12 +0200
commitd950f264ff7260d8c1e124158d758db13e1ad2d0 (patch)
tree8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/zd1211rw/zd_chip.c
parentqlge: Protect qlge_resume() with CONFIG_PM (diff)
parentlibertas: correct "limited range of data type" warning (diff)
downloadkernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz
kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz
kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 0acb5c345734..e0ac58b8ff1f 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -28,7 +28,6 @@
#include "zd_def.h"
#include "zd_chip.h"
-#include "zd_ieee80211.h"
#include "zd_mac.h"
#include "zd_rf.h"