Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / ti-st / Kconfig

diff --git a/drivers/staging/ti-st/Kconfig b/drivers/staging/ti-st/Kconfig
index 68ad3d0b84a722b275ca76c89a524fd7eafedca1..074b8e89e91359b4a2386e2777e3b2cac00ba16d 100644 (file)
--- a/drivers/staging/ti-st/Kconfig
+++ b/drivers/staging/ti-st/Kconfig
@@ -3,20 +3,9 @@
 # drivers (BT, FM and GPS)
 #
 menu "Texas Instruments shared transport line discipline"
-config TI_ST
-       tristate "Shared transport core driver"
-       depends on RFKILL
-       select FW_LOADER
-       help
-         This enables the shared transport core driver for TI
-         BT / FM and GPS combo chips. This enables protocol drivers
-         to register themselves with core and send data, the responses
-         are returned to relevant protocol drivers based on their
-         packet types.
-
 config ST_BT
        tristate "BlueZ bluetooth driver for ST"
-       depends on BT
+       depends on BT && RFKILL
        select TI_ST
        help
          This enables the Bluetooth driver for TI BT/FM/GPS combo devices.