diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-19 19:17:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-19 19:17:12 -0400 |
commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/zd1211rw/zd_chip.c | |
parent | 04da2cf9bb133355b7073be25ef3ce88c8edc135 (diff) | |
parent | 375da53b8e5e3ff2330b66b377e07a6151a93fe5 (diff) |
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.c | 1 |
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 @@ | |||
28 | 28 | ||
29 | #include "zd_def.h" | 29 | #include "zd_def.h" |
30 | #include "zd_chip.h" | 30 | #include "zd_chip.h" |
31 | #include "zd_ieee80211.h" | ||
32 | #include "zd_mac.h" | 31 | #include "zd_mac.h" |
33 | #include "zd_rf.h" | 32 | #include "zd_rf.h" |
34 | 33 | ||