]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
NFC: nxp-nci: Include unaligned.h instead of access_ok.h
authorGuenter Roeck <linux@roeck-us.net>
Sat, 1 Aug 2015 13:59:29 +0000 (06:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jan 2019 15:16:39 +0000 (16:16 +0100)
commitafb85b1bbe4fa5cf0441a4efe72f9bf7c7aa8258
treee4211135fa5f78d32ebd4c731ae8e145822d7c31
parentd99748864fa96e3c9a8379a710eb628298a29b64
NFC: nxp-nci: Include unaligned.h instead of access_ok.h

commit 2eee74b7e2a496dea49847c36fd09320505f45b7 upstream.

Directly including access_ok.h can result in the following compile errors
if an architecture such as ia64 does not support direct unaligned accesses.

include/linux/unaligned/access_ok.h:7:19: error:
redefinition of 'get_unaligned_le16'
include/linux/unaligned/le_struct.h:6:19: note:
previous definition of 'get_unaligned_le16' was here
include/linux/unaligned/access_ok.h:12:19: error:
redefinition of 'get_unaligned_le32'
include/linux/unaligned/le_struct.h:11:19: note:
previous definition of 'get_unaligned_le32' was here

Include asm/unaligned.h instead and let the architecture decide which
access functions to use.

Cc: Clément Perrochaud <clement.perrochaud@effinnov.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nfc/nxp-nci/firmware.c
drivers/nfc/nxp-nci/i2c.c