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

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (299 commits)
  [ALSA] version 1.0.16rc2
  [ALSA] hda: fix Mic in as output
  [ALSA] emu10k1 - Another EMU0404 Board ID
  [ALSA] emu10k1 - Fix kthread handling at resume
  [ALSA] emu10k1: General cleanup, add new locks, fix alsa bug#3501, kernel bug#9304.
  [ALSA] emu10k1 - Use enum for emu_model types
  [ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards
  [ALSA] emu10k1 - 1616(M) cardbus improvements
  [ALSA] snd:emu10k1: E-Mu updates. Fixes to firmware loading and support for 0404.
  [ALSA] emu10k1: Add comments regarding E-Mu ins and outs.
  [ALSA] oxygen: revert SPI clock frequency change for AK4396/WM8785
  [ALSA] es1938 - improve capture hw pointer reads
  [ALSA] HDA-Intel - Add support for Intel SCH
  [ALSA] hda: Add GPIO mute support to STAC9205
  [ALSA] hda-codec - Add Dell T3400 support
  [ALSA] hda-codec - Add model for HP DV9553EG laptop
  [ALSA] hda-codec - Control SPDIF as slave
  [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's
  [ALSA] Fix Oops with PCM OSS sync
  [ALSA] hda-codec - Add speaker automute to ALC262 HP models
  ...

1 files changed, 9 insertions, 5 deletions

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 706143826aff..9351b8a765b9 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -31,17 +31,18 @@ config 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
+        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 RigKontrol3
             * Native Instruments Kore Controller
+            * Native Instruments Kore Controller 2
             * Native Instruments Audio Kontrol 1
             * Native Instruments Audio 8 DJ
 
@@ -51,12 +52,15 @@ config SND_USB_CAIAQ
 config SND_USB_CAIAQ_INPUT
         bool "enable input device for controllers"
         depends on SND_USB_CAIAQ
+        depends on INPUT=y || INPUT=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 RigKontrol3
+           * Native Instruments Kore Controller
+           * Native Instruments Kore Controller 2
            * Native Instruments Audio Kontrol 1
 
 endmenu