diff options
author | John W. Linville | 2013-04-10 15:31:39 +0200 |
---|---|---|
committer | John W. Linville | 2013-04-10 15:31:39 +0200 |
commit | 6fe5468f452c0c40348ebd4e737758a842286ca8 (patch) | |
tree | befe5ab33c457a9e695b65be72600f383266e611 /drivers/net/wireless/rt2x00/rt2800pci.c | |
parent | brcmfmac: only use ifidx from BDC header in brcmf_rx_frames() (diff) | |
parent | rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs (diff) | |
download | kernel-qcow2-linux-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.gz kernel-qcow2-linux-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.xz kernel-qcow2-linux-6fe5468f452c0c40348ebd4e737758a842286ca8.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index f732ded8f1ba..565a80d0e564 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c @@ -41,6 +41,7 @@ #include <linux/eeprom_93cx6.h> #include "rt2x00.h" +#include "rt2x00mmio.h" #include "rt2x00pci.h" #include "rt2x00soc.h" #include "rt2800lib.h" |