Commit a1d69c60c44134f64945bbf6a6dfda22eaf4a214
Committed by
John W. Linville
1 parent
6158fb37d1
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
brcmfmac: don't include linux/unaligned/access_ok.h
This is a specific implementation, <asm/unaligned.h> is the multiplexer that has the arch-specific knowledge of which of the implementations needs to be used, so include that. This issue was revealed by kbuild testing when <asm/unaligned.h> was added in <linux/ieee80211.h> resulting in redefinition of get_unaligned_be16 (and probably others). Cc: stable@vger.kernel.org # v3.17 Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/net/wireless/brcm80211/brcmfmac/pcie.c
... | ... | @@ -19,10 +19,10 @@ |
19 | 19 | #include <linux/pci.h> |
20 | 20 | #include <linux/vmalloc.h> |
21 | 21 | #include <linux/delay.h> |
22 | -#include <linux/unaligned/access_ok.h> | |
23 | 22 | #include <linux/interrupt.h> |
24 | 23 | #include <linux/bcma/bcma.h> |
25 | 24 | #include <linux/sched.h> |
25 | +#include <asm/unaligned.h> | |
26 | 26 | |
27 | 27 | #include <soc.h> |
28 | 28 | #include <chipcommon.h> |