From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Subject: [PATCH] Bluetooth: remove direct compilation of 6lowpan_iphc.c Date: Fri, 17 Jan 2014 12:29:24 -0700 Message-ID: <1389986964-5177-1-git-send-email-swarren@wwwdotorg.org> Return-path: Received: from avon.wwwdotorg.org ([70.85.31.133]:53557 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629AbaAQT3e (ORCPT ); Fri, 17 Jan 2014 14:29:34 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: "David S. Miller" Cc: Dmitry Eremin-Solenikov , Marcel Holtmann , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net, Alexander Smirnov , netdev@vger.kernel.org, Jukka Rissanen , Stephen Warren From: Stephen Warren It's now built as a separate utility module, and enabling BT selects that module in Kconfig. This fixes: net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): multiple definition of `__ksymtab_lowpan_process_data' net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_process_data+0x0): first defined here net/ieee802154/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): multiple definition of `__ksymtab_lowpan_header_compress' net/bluetooth/built-in.o:(___ksymtab_gpl+lowpan_header_compress+0x0): first defined here net/ieee802154/built-in.o: In function `lowpan_header_compress': net/ieee802154/6lowpan_iphc.c:606: multiple definition of `lowpan_header_compress' net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:606: first defined here net/ieee802154/built-in.o: In function `lowpan_process_data': net/ieee802154/6lowpan_iphc.c:344: multiple definition of `lowpan_process_data' net/bluetooth/built-in.o:/home/swarren/shared/git_wa/kernel/kernel.git/net/bluetooth/../ieee802154/6lowpan_iphc.c:344: first defined here make[1]: *** [net/built-in.o] Error 1 (this change probably simply wasn't "git add"d to a53d34c3465b) Fixes: a53d34c3465b ("net: move 6lowpan compression code to separate module") Fixes: 18722c247023 ("Bluetooth: Enable 6LoWPAN support for BT LE devices") Signed-off-by: Stephen Warren --- net/bluetooth/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile index cc6827e2ce68..80cb215826e8 100644 --- a/net/bluetooth/Makefile +++ b/net/bluetooth/Makefile @@ -12,8 +12,4 @@ bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \ hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \ a2mp.o amp.o 6lowpan.o -ifeq ($(CONFIG_IEEE802154_6LOWPAN),) - bluetooth-y += ../ieee802154/6lowpan_iphc.o -endif - subdir-ccflags-y += -D__CHECK_ENDIAN__ -- 1.8.1.5