| Message ID | 1416428242-9942-1-git-send-email-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi Johannes, On Wed, Nov 19, 2014 at 09:17:22PM +0100, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > 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. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > drivers/nfc/pn544/i2c.c | 2 +- > drivers/nfc/st21nfca/i2c.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to nfc-next, thanks. Cheers, Samuel. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index 440291ab7263..fc02e8d6a193 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -29,8 +29,8 @@ #include <linux/delay.h> #include <linux/nfc.h> #include <linux/firmware.h> -#include <linux/unaligned/access_ok.h> #include <linux/platform_data/pn544.h> +#include <asm/unaligned.h> #include <net/nfc/hci.h> #include <net/nfc/llc.h> diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 0ea756b77519..ff6dacb4d482 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -28,8 +28,8 @@ #include <linux/delay.h> #include <linux/nfc.h> #include <linux/firmware.h> -#include <linux/unaligned/access_ok.h> #include <linux/platform_data/st21nfca.h> +#include <asm/unaligned.h> #include <net/nfc/hci.h> #include <net/nfc/llc.h>