diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 13:58:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 13:58:18 -0400 |
commit | 6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch) | |
tree | f1324a39f155375221ed88db0626f61b75c51db6 /sound/usb/Kconfig | |
parent | fec6dd833e733b5d9588a1f1e4d81118b79b5774 (diff) | |
parent | 76a6106f124e375df0ea6ba6bcf204b8caff786a (diff) |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/usb/Kconfig')
-rw-r--r-- | sound/usb/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 44d6d2ec964..112984f4080 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -65,6 +65,7 @@ config SND_USB_CAIAQ * Native Instruments Guitar Rig Session I/O * Native Instruments Guitar Rig mobile * Native Instruments Traktor Kontrol X1 + * Native Instruments Traktor Kontrol S4 To compile this driver as a module, choose M here: the module will be called snd-usb-caiaq. @@ -82,6 +83,7 @@ config SND_USB_CAIAQ_INPUT * Native Instruments Kore Controller * Native Instruments Kore Controller 2 * Native Instruments Audio Kontrol 1 + * Native Instruments Traktor Kontrol S4 config SND_USB_US122L tristate "Tascam US-122L USB driver" |