Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255dd5b7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo
Browse files

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: 38aa4da5 ("Bluetooth: btrsi: add new rsi bluetooth driver")
Acked-by; Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent abd5f008

drivers/bluetooth/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/rsi/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -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.