diff options
author | 2017-08-23 15:37:53 +1000 | |
---|---|---|
committer | 2017-09-20 13:30:09 +1000 | |
commit | 8632ec8cdcaead67c019f1ba36760d1bdd0c5d23 (patch) | |
tree | df320fc3b6971f5f82618954852709ddcc9c5051 /arch/powerpc/configs/pasemi_defconfig | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
download | linux-8632ec8cdcaead67c019f1ba36760d1bdd0c5d23.tar.gz linux-8632ec8cdcaead67c019f1ba36760d1bdd0c5d23.tar.bz2 linux-8632ec8cdcaead67c019f1ba36760d1bdd0c5d23.zip |
powerpc/configs: Update for CONFIG_SND changes
Commit eb3b705aaed9 ("ALSA: Make CONFIG_SND_OSSEMUL user-selectable")
means we need to set CONFIG_SND_OSSEMUL in our configs, otherwise we
lose some of the SND symbols.
And commit 0181307abc1d ("ALSA: seq: Reorganize kconfig and build")
reorganised things, which causes the churn.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/pasemi_defconfig')
-rw-r--r-- | arch/powerpc/configs/pasemi_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 8cf4a46bef86..6daa56f8895c 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig @@ -115,9 +115,10 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y -CONFIG_SND_SEQUENCER=y +CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y +CONFIG_SND_SEQUENCER=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_USX2Y=y |