From: Tobias Klauser <tklau...@distanz.ch>
[ Upstream commit d916d923724d59cde99ee588f15eec59dd863bbd ]
Including linux/unaligned/access_ok.h causes the allmodconfig build on
ia64 (and maybe others) to fail with the following warnings:
include/linux/unaligned/access_ok.h:7:19: error: redefinition of
'get_unaligned_le16'
include/linux/unaligned/access_ok.h:12:19: error: redefinition of
'get_unaligned_le32'
include/linux/unaligned/access_ok.h:17:19: error: redefinition of
'get_unaligned_le64'
include/linux/unaligned/access_ok.h:22:19: error: redefinition of
'get_unaligned_be16'
include/linux/unaligned/access_ok.h:27:19: error: redefinition of
'get_unaligned_be32'
include/linux/unaligned/access_ok.h:32:19: error: redefinition of
'get_unaligned_be64'
include/linux/unaligned/access_ok.h:37:20: error: redefinition of
'put_unaligned_le16'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of
'put_unaligned_le32'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of
'put_unaligned_le64'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of
'put_unaligned_be16'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of
'put_unaligned_be32'
include/linux/unaligned/access_ok.h:42:20: error: redefinition of
'put_unaligned_be64'
Fix these by including asm/unaligned.h instead and leave it up to the
architecture to decide how to implement unaligned accesses.
Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support")
Reported-by: kbuild test robot <fengguang...@intel.com>
Link: https://lkml.org/lkml/2016/10/22/247
Cc: Vincent Cuissard <cuiss...@marvell.com>
Signed-off-by: Tobias Klauser <tklau...@distanz.ch>
Signed-off-by: Samuel Ortiz <sa...@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
drivers/nfc/nfcmrvl/fw_dnld.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c
index af62c4c854f3..b4f31dad40d6 100644
--- a/drivers/nfc/nfcmrvl/fw_dnld.c
+++ b/drivers/nfc/nfcmrvl/fw_dnld.c
@@ -17,7 +17,7 @@
*/
#include <linux/module.h>
-#include <linux/unaligned/access_ok.h>
+#include <asm/unaligned.h>
#include <linux/firmware.h>
#include <linux/nfc.h>
#include <net/nfc/nci.h>
--
2.14.1
