summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-12-08 21:58:58 +0300
committerJohn W. Linville <linville@tuxdriver.com>2014-12-08 21:58:58 +0300
commit81c412600f946fc1c8731685cb6c6fae8002043a (patch)
tree87bbdf52615ec4ee6003b69e74ea330ca1427e46 /drivers/net/wireless/brcm80211/brcmfmac/pcie.c
parentfc99dd0829fd4d080b78141ade9a79bcc3dcd160 (diff)
parent87141db0848aa20c43d453f5545efc8f390d4372 (diff)
downloadlinux-81c412600f946fc1c8731685cb6c6fae8002043a.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/pcie.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/pcie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index a66481976d5c..905991fdb7b1 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -19,10 +19,10 @@
#include <linux/pci.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
-#include <linux/unaligned/access_ok.h>
#include <linux/interrupt.h>
#include <linux/bcma/bcma.h>
#include <linux/sched.h>
+#include <asm/unaligned.h>
#include <soc.h>
#include <chipcommon.h>