| Message ID | 20180616.164059.1116555189277956188.davem@davemloft.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [COMMITTED] bluetooth: hci_nokia: Don't include linux/unaligned/le_struct.h directly. | expand |
Hi Dave, > 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> > --- > drivers/bluetooth/hci_nokia.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Marcel Holtmann <marcel@holtmann.org> Regards Marcel
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>
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> --- drivers/bluetooth/hci_nokia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)