diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
| commit | 8732baafc3f19e69df683c3f0f36c13cec746fb9 (patch) | |
| tree | 9059d0fe8f2a49425edab88ea8e7d5337e13e66c /drivers/net/wireless/rtlwifi/rtl8192se/sw.c | |
| parent | 7a9bc9b81a5bc6e44ebc80ef781332e4385083f2 (diff) | |
| parent | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/sw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c index 730bcc919529..ad4b4803482d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c @@ -29,7 +29,6 @@ #include "../wifi.h" #include "../core.h" -#include "../pci.h" #include "../base.h" #include "../pci.h" #include "reg.h" |