From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 2 Jan 2018 10:50:30 +0000 (+0100)
Subject: Bluetooth: hciuart: add nvmem dependency
X-Git-Tag: Ubuntu-5.10.0-12.13~8533^2~177^2~17
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b71b25fed1c3fa7fdeba4bbda2d17fb384a80508;p=mirror_ubuntu-hirsute-kernel.git

Bluetooth: hciuart: add nvmem dependency

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>
---

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 41932f0e68d0..d816ce9e23a7 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -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.