Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / Kconfig

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ed371684c133d184e9d68f87b85ea171f6107a13..c6f9c2fb48910fadb1f3cd89dd52d1d699915903 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -27,12 +27,12 @@ menuconfig BT
          compile it as module (bluetooth).
 
          To use Linux Bluetooth subsystem, you will need several user-space
-         utilities like hciconfig and hcid.  These utilities and updates to
-         Bluetooth kernel modules are provided in the BlueZ packages.
-         For more information, see <http://www.bluez.org/>.
+         utilities like hciconfig and bluetoothd.  These utilities and updates
+         to Bluetooth kernel modules are provided in the BlueZ packages.  For
+         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"