Merge branch 'master' of /home/src/linux-2.6/

[mv-sheeva.git] / drivers / usb / class / Kconfig

diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 333e39bb105f8c97a113a9ab6b1ac225d2b457b2..ef105a92a7bdf7969c7ac3f00c0415e72269ea52 100644 (file)
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -28,29 +28,6 @@ config USB_AUDIO
          To compile this driver as a module, choose M here: the
          module will be called audio.
 
-comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem"
-       depends on USB && BT
-
-config USB_BLUETOOTH_TTY
-       tristate "USB Bluetooth TTY support"
-       depends on USB && BT=n
-       ---help---
-         This driver implements a nonstandard tty interface to a Bluetooth
-         device that can be used only by specialized Bluetooth HCI software.
-
-         Say Y here if you want to use OpenBT Bluetooth stack (available
-         at <http://developer.axis.com/software>), or other TTY based
-         Bluetooth stacks, and want to connect a USB Bluetooth device
-         to your computer's USB port.
-
-         Do *not* enable this driver if you want to use generic Linux
-         Bluetooth support.
-
-         If in doubt, say N here.
-
-         To compile this driver as a module, choose M here: the
-         module will be called bluetty.
-
 config USB_MIDI
        tristate "USB MIDI support"
        depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER