diff options
| author |   Stephen Warren <swarren@nvidia.com> | 2014-01-17 12:29:24 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-17 19:08:54 -0800 |
| commit | 7bbc084c9971a8c00be2feefcf704a20da3886bb (patch) | |
| tree | 8deadd75128b1aebe09f4b26e24b48e147bcf164 | |
| parent | virtio-net: fix build error when CONFIG_AVERAGE is not enabled (diff) | |
| download | linux-dev-7bbc084c9971a8c00be2feefcf704a20da3886bb.tar.xz linux-dev-7bbc084c9971a8c00be2feefcf704a20da3886bb.zip | |
Bluetooth: remove direct compilation of 6lowpan_iphc.c
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 <swarren@nvidia.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bluetooth/Makefile | 4 |
1 files changed, 0 insertions, 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__ |