aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-11 09:47:54 -0400
committerMarcel Holtmann <marcel@holtmann.org>2017-10-11 14:09:37 -0400
commit05e89fb576f580ac95e7a5d00bdb34830b09671a (patch)
treef29eddc3b762cd931d76b07215fa6554f26556e8
parent81a1905382a380beeba201ce41276afd9035dc64 (diff)
Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS
It is no longer possible to build BT_HCIUART into the kernel when SERIAL_DEV_BUS is a loadable module, even if none of the SERIAL_DEV_BUS based implementations are selected: drivers/bluetooth/hci_ldisc.o: In function `hci_uart_set_flow_control': hci_ldisc.c:(.text+0xb40): undefined reference to `serdev_device_set_flow_control' hci_ldisc.c:(.text+0xb5c): undefined reference to `serdev_device_set_tiocm' This adds a dependency to avoid the broken configuration. Fixes: 7841d554809b ("Bluetooth: hci_uart_set_flow_control: Fix NULL deref when using serdev") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 082e1c7329de..6475f8c0d3b2 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -65,6 +65,7 @@ config BT_HCIBTSDIO
65 65
66config BT_HCIUART 66config BT_HCIUART
67 tristate "HCI UART driver" 67 tristate "HCI UART driver"
68 depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS
68 depends on TTY 69 depends on TTY
69 help 70 help
70 Bluetooth HCI UART driver. 71 Bluetooth HCI UART driver.
@@ -79,7 +80,6 @@ config BT_HCIUART
79config BT_HCIUART_SERDEV 80config BT_HCIUART_SERDEV
80 bool 81 bool
81 depends on SERIAL_DEV_BUS && BT_HCIUART 82 depends on SERIAL_DEV_BUS && BT_HCIUART
82 depends on SERIAL_DEV_BUS=y || SERIAL_DEV_BUS=BT_HCIUART
83 default y 83 default y
84 84
85config BT_HCIUART_H4 85config BT_HCIUART_H4