diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
| commit | 1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch) | |
| tree | 945ba95f11016871f9d5241b7da2712f9367081a /sound/pci/hda/Kconfig | |
| parent | f1a77547c21fe942e95ebaadbc9200f26d138574 (diff) | |
| parent | 12e180a27f3e066a4ed4a446d428fd117f168beb (diff) | |
| download | linux-1962fcab4ee80e555bcc9d0f50e416800d474fa2.tar.bz2 | |
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'sound/pci/hda/Kconfig')
| -rw-r--r-- | sound/pci/hda/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 47aa7b8b7519..5c296d30729c 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -4,7 +4,7 @@ config SND_HDA tristate select SND_PCM select SND_VMASTER - select SND_KCTL_JACK + select SND_JACK select SND_HDA_CORE config SND_HDA_INTEL |