Skip to content

Commit

Permalink
ALSA: arm: Fix empty menuconfig SND_ARM
Browse files Browse the repository at this point in the history
commit 3c8f771 ("ASoC: fix broken pxa SoC support") has removed
the SND_ARM dependency from SND_PXA2XX_LIB and SND_PXA2XX_LIB_AC97,
by moving these config entries outside of the "if SND_ARM ... endif"
construct.

However, by placing these 2 symbols right between the SND_ARM
menuconfig definition and the first SND_ARM menu entry, the side
effect is that the SND_ARM menu becomes empty and all the config
entries caught between "if SND_ARM ... endif" no more belong to
menuconfig SND_ARM, but to its parent (menuconfig SND).

Fix this.

Signed-off-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
erosca authored and tiwai committed Aug 1, 2016
1 parent 9b51fe3 commit e30129a
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions sound/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ menuconfig SND_ARM
Drivers that are implemented on ASoC can be found in
"ALSA for SoC audio support" section.

config SND_PXA2XX_LIB
tristate
select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
select SND_DMAENGINE_PCM

config SND_PXA2XX_LIB_AC97
bool

if SND_ARM

config SND_ARMAACI
Expand All @@ -42,3 +34,10 @@ config SND_PXA2XX_AC97

endif # SND_ARM

config SND_PXA2XX_LIB
tristate
select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
select SND_DMAENGINE_PCM

config SND_PXA2XX_LIB_AC97
bool

0 comments on commit e30129a

Please sign in to comment.