From: David S. Miller <davem@davemloft.net>
Date: Sat, 16 Jun 2018 23:38:55 +0000 (+0900)
Subject: bluetooth: hci_nokia: Don't include linux/unaligned/le_struct.h directly.
X-Git-Tag: v4.19~747^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9122886d9848d00a01888116a58624b9ba95cdc;p=platform%2Fkernel%2Flinux-rpi3.git

bluetooth: hci_nokia: Don't include linux/unaligned/le_struct.h directly.

This breaks the build as this header is not meant to be used in this
way.

./include/linux/unaligned/access_ok.h:8:28: error: redefinition of ‘get_unaligned_le16’
 static __always_inline u16 get_unaligned_le16(const void *p)
                            ^~~~~~~~~~~~~~~~~~
In file included from drivers/bluetooth/hci_nokia.c:32:
./include/linux/unaligned/le_struct.h:7:19: note: previous definition of ‘get_unaligned_le16’ was here
 static inline u16 get_unaligned_le16(const void *p)

Use asm/unaligned.h instead.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index 14d159e..2dc33e6 100644
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/unaligned/le_struct.h>
+#include <asm/unaligned.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>