Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8632ec8c authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/configs: Update for CONFIG_SND changes 



Commit eb3b705a ("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 0181307a ("ALSA: seq: Reorganize kconfig and build")
reorganised things, which causes the churn.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 94686c3c

arch/powerpc/configs/g5_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -138,10 +138,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y 
CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SEQUENCER=m

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQUENCER_OSS=m

CONFIG_SND_POWERMAC=m

CONFIG_SND_AOA=m

CONFIG_SND_AOA_FABRIC_LAYOUT=m

arch/powerpc/configs/gamecube_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -64,11 +64,12 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_CLUT224 is not set

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_OSS=y

# CONFIG_SND_VERBOSE_PROCFS is not set

CONFIG_SND_SEQUENCER=y

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_GENERIC=y

arch/powerpc/configs/pasemi_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/configs/pmac32_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -227,11 +227,12 @@ CONFIG_FRAMEBUFFER_CONSOLE=y 
CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

CONFIG_SND_SEQUENCER_OSS=m

CONFIG_SND_DUMMY=m

CONFIG_SND_POWERMAC=m

CONFIG_SND_AOA=m

arch/powerpc/configs/ppc64_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -222,11 +222,12 @@ CONFIG_FRAMEBUFFER_CONSOLE=y 
CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

CONFIG_SND_SEQUENCER_OSS=m

CONFIG_SND_POWERMAC=m

CONFIG_SND_AOA=m

CONFIG_SND_AOA_FABRIC_LAYOUT=m