summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-06-17 08:38:55 +0900
committerDavid S. Miller <davem@davemloft.net>2018-06-17 08:38:55 +0900
commita9122886d9848d00a01888116a58624b9ba95cdc (patch)
tree1e31f35b19e1d8584116194e800c6d956da54a5d /drivers/bluetooth
parent9bbe60a67be5a1c6f79b3c9be5003481a50529ff (diff)
downloadlinux-stable-a9122886d9848d00a01888116a58624b9ba95cdc.tar.gz
linux-stable-a9122886d9848d00a01888116a58624b9ba95cdc.tar.bz2
linux-stable-a9122886d9848d00a01888116a58624b9ba95cdc.zip
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>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_nokia.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index 14d159e2042d..2dc33e65d2d0 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>