Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[mv-sheeva.git] / net / bluetooth / Kconfig

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ee3b3049d385839297d7a87e53fde0d6b5ec8456..ed371684c133d184e9d68f87b85ea171f6107a13 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -43,19 +43,6 @@ config BT_L2CAP
          Say Y here to compile L2CAP support into the kernel or say M to
          compile it as module (l2cap).
 
-config BT_L2CAP_EXT_FEATURES
-       bool "L2CAP Extended Features support (EXPERIMENTAL)"
-       depends on BT_L2CAP && EXPERIMENTAL
-       help
-         This option enables the L2CAP Extended Features support. These
-         new features include the Enhanced Retransmission and Streaming
-         Modes, the Frame Check Sequence (FCS), and Segmentation and
-         Reassembly (SAR) for L2CAP packets. They are a required for the
-         new Alternate MAC/PHY and the Bluetooth Medical Profile.
-
-         You should say N unless you know what you are doing. Note that
-         this is in an experimental state yet.
-
 config BT_SCO
        tristate "SCO links support"
        depends on BT