diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-16 07:50:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-16 07:50:49 +0100 |
commit | a9104f989916aac5d92bfa2c51915d5985fb2e6c (patch) | |
tree | 17bef4eac561e3ac90d98d68190978e686712b67 /sound/usb/Kconfig | |
parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
parent | 89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff) | |
download | linux-a9104f989916aac5d92bfa2c51915d5985fb2e6c.tar.gz linux-a9104f989916aac5d92bfa2c51915d5985fb2e6c.tar.bz2 linux-a9104f989916aac5d92bfa2c51915d5985fb2e6c.zip |
Merge branch 'topic/misc' into fix/misc
Diffstat (limited to 'sound/usb/Kconfig')
-rw-r--r-- | sound/usb/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 73525c048e7f..c570ae3e6d55 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -21,6 +21,18 @@ config SND_USB_AUDIO To compile this driver as a module, choose M here: the module will be called snd-usb-audio. +config SND_USB_UA101 + tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)" + depends on EXPERIMENTAL + select SND_PCM + select SND_RAWMIDI + help + Say Y here to include support for the Edirol UA-101 and UA-1000 + audio/MIDI interfaces. + + To compile this driver as a module, choose M here: the module + will be called snd-ua101. + config SND_USB_USX2Y tristate "Tascam US-122, US-224 and US-428 USB driver" depends on X86 || PPC || ALPHA |