summaryrefslogtreecommitdiff
path: root/net/bluetooth/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-18 16:49:17 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-18 16:49:17 -0500
commitf4f314bf6fd39d85065c3fcda27bd594163abcf0 (patch)
tree2b88d345b2563e51c196b038ff5f74b94c77b2e0 /net/bluetooth/Kconfig
parentc269a20393500e84e8cbae23ca6d65e1107433c4 (diff)
parent8ffd878419839638d1aea102455b575da39c1a62 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/Kconfig')
-rw-r--r--net/bluetooth/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index e45eae66eaf3..c6f9c2fb4891 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -32,7 +32,7 @@ menuconfig BT
more information, see <http://www.bluez.org/>.
config BT_L2CAP
- tristate "L2CAP protocol support"
+ bool "L2CAP protocol support"
depends on BT
select CRC16
help
@@ -40,19 +40,13 @@ config BT_L2CAP
connection oriented and connection-less data transport. L2CAP
support is required for most Bluetooth applications.
- Say Y here to compile L2CAP support into the kernel or say M to
- compile it as module (l2cap).
-
config BT_SCO
- tristate "SCO links support"
+ bool "SCO links support"
depends on BT
help
SCO link provides voice transport over Bluetooth. SCO support is
required for voice applications like Headset and Audio.
- Say Y here to compile SCO support into the kernel or say M to
- compile it as module (sco).
-
source "net/bluetooth/rfcomm/Kconfig"
source "net/bluetooth/bnep/Kconfig"