diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
| commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
| tree | 7569661eae727a5a349e4c98dba42ca681857462 /sound/core/Kconfig | |
| parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
| parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/core/Kconfig')
| -rw-r--r-- | sound/core/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 2dc7776e218c..ca6cdf6f9968 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
| @@ -217,6 +217,9 @@ config SND_PCM_XRUN_DEBUG | |||
| 217 | config SND_VMASTER | 217 | config SND_VMASTER |
| 218 | bool | 218 | bool |
| 219 | 219 | ||
| 220 | config SND_KCTL_JACK | ||
| 221 | bool | ||
| 222 | |||
| 220 | config SND_DMA_SGBUF | 223 | config SND_DMA_SGBUF |
| 221 | def_bool y | 224 | def_bool y |
| 222 | depends on X86 | 225 | depends on X86 |