summaryrefslogtreecommitdiffstats
path: root/sound/core/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:18 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:18 +0100
commit9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch)
tree7569661eae727a5a349e4c98dba42ca681857462 /sound/core/Kconfig
parent627b79628f56c3deeb17dec1edf6899b49552fa4 (diff)
parentf2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff)
downloadop-kernel-dev-9e4ce164ee3a1d07580f017069c25d180b0aa785.zip
op-kernel-dev-9e4ce164ee3a1d07580f017069c25d180b0aa785.tar.gz
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/core/Kconfig')
-rw-r--r--sound/core/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 2dc7776..ca6cdf6 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -217,6 +217,9 @@ config SND_PCM_XRUN_DEBUG
config SND_VMASTER
bool
+config SND_KCTL_JACK
+ bool
+
config SND_DMA_SGBUF
def_bool y
depends on X86
OpenPOWER on IntegriCloud