diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-26 15:54:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-26 15:54:45 -0400 |
commit | a85c9bb895aed633615078f69f4a4bce9e39be5f (patch) | |
tree | 0eafc0be614fc70a1c853ee2249e3152d8d15718 /drivers/net/wireless/iwlwifi/iwl-agn-sta.c | |
parent | de248a75c35e0208294cf304b112916254b69184 (diff) | |
parent | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (diff) | |
download | blackbird-op-linux-a85c9bb895aed633615078f69f4a4bce9e39be5f.tar.gz blackbird-op-linux-a85c9bb895aed633615078f69f4a4bce9e39be5f.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index 0119e7a7b78d..67e6f1d2a08b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -30,7 +30,6 @@ #include <net/mac80211.h> #include "iwl-dev.h" -#include "iwl-core.h" #include "iwl-agn.h" #include "iwl-trans.h" |