Re: [2.6 patch] schedule obsolete OSS drivers for removal (version 2)

[Lee Revell <rlrevell@joe-job.com>]

On Tue, 2005-08-09 at 19:49 +0200, Adrian Bunk wrote:
> On Tue, Aug 09, 2005 at 01:13:51PM -0400, Lee Revell wrote:
> > On Fri, 2005-07-29 at 17:32 +0200, Adrian Bunk wrote:
> > > This patch schedules obsolete OSS drivers (with ALSA drivers that 
> > > support the same hardware) for removal.
> > > 
> > > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> > > 
> > 
> > Someone on linux-audio-user just pointed out that the OSS USB audio and
> > midi modules were never deprecated, much less scheduled to be removed.
> > 
> > Maybe the best way to deprecate them is to move them to Sound -> OSS,
> > that's where they belong anyway.
> 
> I'd deprecate them without moving them.
> 

Here's the patch.  The bug was that CONFIG_USB_AUDIO and CONFIG_USB_MIDI
need to depend on CONFIG_SOUND_PRIME.

It also fixes some typos and clarifies the help text.

Signed-Off-By: Lee Revell <rlrevell@joe-job.com>

--- linux-2.6.13-rc4/drivers/usb/class/Kconfig~	2005-08-12 15:54:36.000000000 -0400
+++ linux-2.6.13-rc4/drivers/usb/class/Kconfig	2005-08-12 15:57:38.000000000 -0400
@@ -5,12 +5,12 @@
 	depends on USB
 
 config USB_AUDIO
-	tristate "USB Audio support"
-	depends on USB && SOUND
+	tristate "USB Audio support (OSS)"
+	depends on USB && SOUND_PRIME
 	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
-	  the OSS sound driver; ALSA has its own option for usb audio support.
+	  the OSS sound system; ALSA has its own option for USB audio support.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called audio.
@@ -39,11 +39,13 @@
 	  module will be called bluetty.
 
 config USB_MIDI
-	tristate "USB MIDI support"
-	depends on USB && SOUND
+	tristate "USB MIDI support (OSS)"
+	depends on USB && SOUND_PRIME
 	---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: