[ALSA] caiaq - support for Native Instrument's RigKontrol3

This patch adds support for Native Instrument's upcoming
RigKontrol3 sound interface.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 315360f..7061438 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -40,6 +40,7 @@ config SND_USB_CAIAQ
           namely:
 
            * Native Instruments RigKontrol2
+           * Native Instruments RigKontrol3
            * Native Instruments Kore Controller
            * Native Instruments Audio Kontrol 1
            * Native Instruments Audio 8 DJ
@@ -55,6 +56,7 @@ config SND_USB_CAIAQ_INPUT
          alpha dials and analog pedals on the following products:
 
           * Native Instruments RigKontrol2
+          * Native Instruments RigKontrol3
           * Native Instruments Audio Kontrol 1
 
 endmenu

diff --cc sound/usb/caiaq/caiaq-audio.c
Simple merge

diff --cc sound/usb/caiaq/caiaq-device.c
Simple merge

diff --cc sound/usb/caiaq/caiaq-device.h
Simple merge

diff --cc sound/usb/caiaq/caiaq-input.c
Simple merge