diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 10:37:41 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-04-16 10:37:41 +0200 |
| commit | f09d045e2a61d2fdae3d0127208f18c9f44acf80 (patch) | |
| tree | edbe84444ac4e6f1d52aa87aef2e2e7d008fcb16 /sound/usb/Kconfig | |
| parent | dc57da3875f527b1cc195ea4ce5bd32e1e68433d (diff) | |
| parent | 27762b2ce16d5c6f7bc8ab1aad1b9179076f997a (diff) | |
| download | blackbird-obmc-linux-f09d045e2a61d2fdae3d0127208f18c9f44acf80.tar.gz blackbird-obmc-linux-f09d045e2a61d2fdae3d0127208f18c9f44acf80.zip | |
Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
Diffstat (limited to 'sound/usb/Kconfig')
| -rw-r--r-- | sound/usb/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index c570ae3e6d55..44d6d2ec964f 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -22,8 +22,7 @@ config SND_USB_AUDIO will be called snd-usb-audio. config SND_USB_UA101 - tristate "Edirol UA-101/UA-1000 driver (EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Edirol UA-101/UA-1000 driver" select SND_PCM select SND_RAWMIDI help @@ -65,6 +64,7 @@ config SND_USB_CAIAQ * Native Instruments Audio 8 DJ * Native Instruments Guitar Rig Session I/O * Native Instruments Guitar Rig mobile + * Native Instruments Traktor Kontrol X1 To compile this driver as a module, choose M here: the module will be called snd-usb-caiaq. |
