Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (122 commits)
  [ALSA] version 1.0.14rc4
  [ALSA] Add speaker pin sequencing to hda_codec.c:snd_hda_parse_pin_def_config()
  [ALSA] hda-codec - Add ALC861VD Lenovo support
  [ALSA] hda-codec - Fix connection list in generic parser
  [ALSA] usb-audio: work around wrong wMaxPacketSize on ESI M4U
  [ALSA] usb-audio: work around broken M-Audio MidiSport Uno firmware
  [ALSA] usb-audio: explicitly match Logitech QuickCam
  [ALSA] hda-codec - Fix a typo
  [ALSA] hda-codec - Fix ALC880 uniwill auto-mutes
  [ALSA] hda-codec - Fix AD1988 SPDIF playback route control
  [ALSA] wm8750 typo fix
  [ALSA] wavefront: only declare isapnp on CONFIG_PNP
  [ALSA] hda-codec - bug fixes for stac92xx HDA codecs.
  [ALSA] add MODULE_FIRMWARE entries
  [ALSA] do not depend on FW_LOADER when internal firmware images are used
  [ALSA] hda-codec - Fix resume of STAC92xx codecs
  [ALSA] usbaudio - Revert the minimal period size fix patch
  [ALSA] hda-codec - Add support for new HP DV series laptops
  [ALSA] usb-audio - Fix the minimum period size per transfer mode
  [ALSA] sound/pcmcia/vx/vxpocket.c: fix an if() condition
  ...

1 files changed, 28 insertions, 0 deletions

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index f05d02f5b69f..315360f31278 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -29,5 +29,33 @@ config SND_USB_USX2Y
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-usx2y.
 
+config SND_USB_CAIAQ
+        tristate "Native Instruments USB audio devices"
+         depends on SND && USB
+         select SND_HWDEP
+         select SND_RAWMIDI
+         select SND_PCM
+         help
+           Say Y here to include support for caiaq USB audio interfaces,
+           namely:
+
+            * Native Instruments RigKontrol2
+            * Native Instruments Kore Controller
+            * Native Instruments Audio Kontrol 1
+            * Native Instruments Audio 8 DJ
+
+           To compile this driver as a module, choose M here: the module
+           will be called snd-usb-caiaq.
+
+config SND_USB_CAIAQ_INPUT
+        bool "enable input device for controllers"
+        depends on SND_USB_CAIAQ
+        help
+          Say Y here to support input controllers like buttons, knobs,
+          alpha dials and analog pedals on the following products:
+
+           * Native Instruments RigKontrol2
+           * Native Instruments Audio Kontrol 1
+
 endmenu