diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 22:18:24 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-03-27 10:11:58 +0300 |
| commit | 255dd5b79d5474dad3ecebe99be7818684921abd (patch) | |
| tree | f8902b1db63564beeb6439cd81b7c7725c1ae9a4 | |
| parent | abd5f00844ec7fa507064ee4a22b3605c64c7d31 (diff) | |
Bluetooth: btrsi: rework dependencies
The linkage between the bluetooth driver and the wireless
driver is not defined properly, leading to build problems
such as:
warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X)
drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt':
(.text+0x205): undefined reference to `rsi_bt_ops'
As the dependency is actually the reverse (RSI_91X uses
the BT_RSI driver, not the other way round), this changes
the dependency to match, and enables the bluetooth driver
from the RSI_COEX symbol.
Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver")
Acked-by; Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/bluetooth/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/rsi/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index d8bbd661dbdb..149a38ee1fce 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -393,9 +393,7 @@ config BT_QCOMSMD kernel or say M to compile as a module. config BT_HCIRSI - tristate "Redpine HCI support" - default n - select RSI_COEX + tristate help Redpine BT driver. This driver handles BT traffic from upper layers and pass diff --git a/drivers/net/wireless/rsi/Kconfig b/drivers/net/wireless/rsi/Kconfig index f004be33fcfa..976c21866230 100644 --- a/drivers/net/wireless/rsi/Kconfig +++ b/drivers/net/wireless/rsi/Kconfig @@ -13,6 +13,7 @@ if WLAN_VENDOR_RSI config RSI_91X tristate "Redpine Signals Inc 91x WLAN driver support" + select BT_HCIRSI if RSI_COEX depends on MAC80211 ---help--- This option enabes support for RSI 1x1 devices. @@ -44,7 +45,8 @@ config RSI_USB config RSI_COEX bool "Redpine Signals WLAN BT Coexistence support" - depends on BT_HCIRSI && RSI_91X + depends on BT && RSI_91X + depends on !(BT=m && RSI_91X=y) default y ---help--- This option enables the WLAN BT coex support in rsi drivers. |