diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 17:21:02 -0700 |
| commit | 54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch) | |
| tree | 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /drivers/usb/class/Kconfig | |
| parent | 6d8de3a26b5c20b04a9317b4446582167d5883da (diff) | |
| parent | b71e318cdb1dc301d734fdd4983dfc6dc167235a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/class/Kconfig')
| -rw-r--r-- | drivers/usb/class/Kconfig | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig index 0561d0234f2..333e39bb105 100644 --- 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: |