diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:28:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:28:50 -0400 |
| commit | b38d355eaa223e420d0c45ff7a3279ea811552c5 (patch) | |
| tree | 4a6b3341e1b8b72afdc19e3b9bfe8c40219c04aa /drivers/net/wireless/rndis_wlan.c | |
| parent | ca1ba7caa68520864e4b9227e67f3bbc6fed373b (diff) | |
| parent | af2bf4b4ee58d262a9a5c1d4ce6f81835058f8b5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 6e0c61145b18..0c13840a7de5 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -36,13 +36,11 @@ | |||
| 36 | #include <linux/mii.h> | 36 | #include <linux/mii.h> |
| 37 | #include <linux/usb.h> | 37 | #include <linux/usb.h> |
| 38 | #include <linux/usb/cdc.h> | 38 | #include <linux/usb/cdc.h> |
| 39 | #include <linux/wireless.h> | ||
| 40 | #include <linux/ieee80211.h> | 39 | #include <linux/ieee80211.h> |
| 41 | #include <linux/if_arp.h> | 40 | #include <linux/if_arp.h> |
| 42 | #include <linux/ctype.h> | 41 | #include <linux/ctype.h> |
| 43 | #include <linux/spinlock.h> | 42 | #include <linux/spinlock.h> |
| 44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
| 45 | #include <net/iw_handler.h> | ||
| 46 | #include <net/cfg80211.h> | 44 | #include <net/cfg80211.h> |
| 47 | #include <linux/usb/usbnet.h> | 45 | #include <linux/usb/usbnet.h> |
| 48 | #include <linux/usb/rndis_host.h> | 46 | #include <linux/usb/rndis_host.h> |