Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 0 insertions, 25 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index abe3aa67ed00..55660eaf947c 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -87,17 +87,6 @@ config USB_LCD
           To compile this driver as a module, choose M here: the
           module will be called usblcd.
 
-config USB_BERRY_CHARGE
-        tristate "USB BlackBerry recharge support"
-        depends on USB
-        help
-          Say Y here if you want to connect a BlackBerry device to your
-          computer's USB port and have it automatically switch to "recharge"
-          mode.
-
-          To compile this driver as a module, choose M here: the
-          module will be called berry_charge.
-
 config USB_LED
         tristate "USB LED driver support"
         depends on USB
@@ -242,17 +231,3 @@ config USB_ISIGHTFW
           driver beforehand. Tools for doing so are available at
           http://bersace03.free.fr
 
-config USB_VST
-        tristate "USB VST driver"
-        depends on USB
-        help
-          This driver is intended for Vernier Software Technologies
-          bulk usb devices such as their Ocean-Optics spectrometers or
-          Labquest.
-          It is a bulk channel driver with configurable read and write
-          timeouts.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vstusb.
-
-