| From 2eee74b7e2a496dea49847c36fd09320505f45b7 Mon Sep 17 00:00:00 2001 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Sat, 1 Aug 2015 06:59:29 -0700 |
| Subject: NFC: nxp-nci: Include unaligned.h instead of access_ok.h |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Guenter Roeck <linux@roeck-us.net> |
| |
| 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 | 2 +- |
| drivers/nfc/nxp-nci/i2c.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/nfc/nxp-nci/firmware.c |
| +++ b/drivers/nfc/nxp-nci/firmware.c |
| @@ -24,7 +24,7 @@ |
| #include <linux/completion.h> |
| #include <linux/firmware.h> |
| #include <linux/nfc.h> |
| -#include <linux/unaligned/access_ok.h> |
| +#include <asm/unaligned.h> |
| |
| #include "nxp-nci.h" |
| |
| --- a/drivers/nfc/nxp-nci/i2c.c |
| +++ b/drivers/nfc/nxp-nci/i2c.c |
| @@ -36,7 +36,7 @@ |
| #include <linux/of_gpio.h> |
| #include <linux/of_irq.h> |
| #include <linux/platform_data/nxp-nci.h> |
| -#include <linux/unaligned/access_ok.h> |
| +#include <asm/unaligned.h> |
| |
| #include <net/nfc/nfc.h> |
| |
