summaryrefslogtreecommitdiff
path: root/drivers/bluetooth/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-04-19 19:50:18 +0200
committerMarcel Holtmann <marcel@holtmann.org>2017-04-22 10:28:40 +0200
commit1fb78fb6c6ad3751cce18d37e773d07858c1ced9 (patch)
treea583be2697f1ddbec77019013ccd7b2cbcbccbb1 /drivers/bluetooth/Makefile
parentf2edd9f67b8bdbe8cc3bc5c0ba4992e511147642 (diff)
Bluetooth: try to improve CONFIG_SERIAL_DEV_BUS dependency
With CONFIG_SERIAL_DEV_BUS=m, the hci_serdev.o file does not actually get built into hci_uart.o as the Makefile doesn't pick it up, leading to a link error with anything referring to it: ERROR: "hci_uart_register_device" [drivers/bluetooth/hci_nokia.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed Changing this in the Makefile would cause another problem when hci_uart itself is built-in and cannot reference symbols from the serdev module. This tries to address both problems by introducing a new hidden Kconfig symbol that controls both the compilation of hci_serdev.o and whether the Nokia driver can be selected. This seems to address the problem for me, though there might be a better way to do it. Fixes: 7bb318680e86 ("Bluetooth: add nokia driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/Makefile')
-rw-r--r--drivers/bluetooth/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index a7f237320f4b..e693ca6eeed9 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -31,7 +31,7 @@ btmrvl-y := btmrvl_main.o
btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o
hci_uart-y := hci_ldisc.o
-hci_uart-$(CONFIG_SERIAL_DEV_BUS) += hci_serdev.o
+hci_uart-$(CONFIG_BT_HCIUART_SERDEV) += hci_serdev.o
hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o
hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o
hci_uart-$(CONFIG_BT_HCIUART_LL) += hci_ll.o