Commit a1d69c60 authored Nov 19, 2014 by Johannes Berg Committed by John W. Linville Nov 20, 2014

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>

parent 6158fb37

drivers/net/wireless/brcm80211/brcmfmac/pcie.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>