]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Bluetooth: hciuart: add nvmem dependency
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Jan 2018 10:50:30 +0000 (11:50 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 8 Jan 2018 20:44:22 +0000 (21:44 +0100)
When the hci support is built-in, but mvmem is a loadable module, we
get a link failure:

drivers/bluetooth/hci_ll.o: In function `hci_ti_probe':
hci_ll.c:(.text+0x226): undefined reference to `nvmem_cell_get'
hci_ll.c:(.text+0x238): undefined reference to `nvmem_cell_read'
hci_ll.c:(.text+0x244): undefined reference to `nvmem_cell_put'

This adds another Kconfig dependency to enforce valid configurations.

Fixes: 0e58d0cdb3eb ("Bluetooth: hci_ll: Add optional nvmem BD address source")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/Kconfig

index 41932f0e68d0da2fd198dc949ef44e7ade4a16a6..d816ce9e23a77716079d902d4d42a8dbc79c0892 100644 (file)
@@ -77,6 +77,7 @@ config BT_HCIBTSDIO
 config BT_HCIUART
        tristate "HCI UART driver"
        depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS
+       depends on NVMEM || !NVMEM
        depends on TTY
        help
          Bluetooth HCI UART driver.