Commit d45dcef7 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan Committed by John W. Linville

Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig

If we want something "bool" built-in in something "tristate" it can't
"depend on" the tristate config option.

Report by DaveM:

   I give it 'y' just to make it happen, for both, and afterways no
   matter how many times I rerun "make oldconfig" I keep seeing things
   like this in my build:

scripts/kconfig/conf --silentoldconfig Kconfig
include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
Reported-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f54b92b9
...@@ -31,9 +31,10 @@ menuconfig BT ...@@ -31,9 +31,10 @@ menuconfig BT
to Bluetooth kernel modules are provided in the BlueZ packages. For to Bluetooth kernel modules are provided in the BlueZ packages. For
more information, see <http://www.bluez.org/>. more information, see <http://www.bluez.org/>.
if BT != n
config BT_L2CAP config BT_L2CAP
bool "L2CAP protocol support" bool "L2CAP protocol support"
depends on BT
select CRC16 select CRC16
help help
L2CAP (Logical Link Control and Adaptation Protocol) provides L2CAP (Logical Link Control and Adaptation Protocol) provides
...@@ -42,11 +43,12 @@ config BT_L2CAP ...@@ -42,11 +43,12 @@ config BT_L2CAP
config BT_SCO config BT_SCO
bool "SCO links support" bool "SCO links support"
depends on BT
help help
SCO link provides voice transport over Bluetooth. SCO support is SCO link provides voice transport over Bluetooth. SCO support is
required for voice applications like Headset and Audio. required for voice applications like Headset and Audio.
endif
source "net/bluetooth/rfcomm/Kconfig" source "net/bluetooth/rfcomm/Kconfig"
source "net/bluetooth/bnep/Kconfig" source "net/bluetooth/bnep/Kconfig"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment