[PATCH] USB: schedule OSS USB drivers for removal

Deprecate the OSS USB drivers.

This patch includes spelling fixes by Lee Revell.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 0561d0234f2314fd963c02c55082c28d578d1473..333e39bb105f8c97a113a9ab6b1ac225d2b457b2 100644 (file)
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -4,9 +4,22 @@
 comment "USB Device Class drivers"
        depends on USB
 
+config OBSOLETE_OSS_USB_DRIVER
+       bool "Obsolete OSS USB drivers"
+       depends on USB && SOUND
+       help
+         This option enables support for the obsolete USB Audio and Midi
+         drivers that are scheduled for removal in the near future since
+         there are ALSA drivers for the same hardware.
+
+         Please contact Adrian Bunk <bunk@stusta.de> if you had to
+         say Y here because of missing support in the ALSA drivers.
+
+         If unsure, say N.
+
 config USB_AUDIO
        tristate "USB Audio support"
-       depends on USB && SOUND
+       depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
        help
          Say Y here if you want to connect USB audio equipment such as
          speakers to your computer's USB port. You only need this if you use
@@ -40,10 +53,12 @@ config USB_BLUETOOTH_TTY
 
 config USB_MIDI
        tristate "USB MIDI support"
-       depends on USB && SOUND
+       depends on USB && SOUND && OBSOLETE_OSS_USB_DRIVER
        ---help---
          Say Y here if you want to connect a USB MIDI device to your
-         computer's USB port. This driver is for devices that comply with
+         computer's USB port.  You only need this if you use the OSS
+         sound system; USB MIDI devices are supported by ALSA's USB
+         audio driver. This driver is for devices that comply with
          'Universal Serial Bus Device Class Definition for MIDI Device'.
 
          The following devices are known to work: