summaryrefslogtreecommitdiff
path: root/sound/core/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-28 06:31:31 (GMT)
committerTakashi Iwai <tiwai@suse.de>2015-04-28 06:31:31 (GMT)
commit1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch)
tree945ba95f11016871f9d5241b7da2712f9367081a /sound/core/Kconfig
parentf1a77547c21fe942e95ebaadbc9200f26d138574 (diff)
parent12e180a27f3e066a4ed4a446d428fd117f168beb (diff)
downloadlinux-1962fcab4ee80e555bcc9d0f50e416800d474fa2.tar.xz
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'sound/core/Kconfig')
-rw-r--r--sound/core/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 313f22e..63cc2e9 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -221,9 +221,6 @@ config SND_PCM_XRUN_DEBUG
config SND_VMASTER
bool
-config SND_KCTL_JACK
- bool
-
config SND_DMA_SGBUF
def_bool y
depends on X86