aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeniu Rosca <roscaeugeniu@gmail.com>2016-07-30 10:00:19 -0400
committerTakashi Iwai <tiwai@suse.de>2016-08-01 10:07:53 -0400
commite30129aed45bc78dc80aed62d8eb44c32d89908a (patch)
treef027514889bdbee211392070080698cf044458f4
parent9b51fe3efe4c270005e34f55a97e5a84ad68e581 (diff)
ALSA: arm: Fix empty menuconfig SND_ARM
commit 3c8f7710c1c4 ("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>
-rw-r--r--sound/arm/Kconfig15
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index e0406211716b..65171f6657a2 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -9,14 +9,6 @@ menuconfig SND_ARM
9 Drivers that are implemented on ASoC can be found in 9 Drivers that are implemented on ASoC can be found in
10 "ALSA for SoC audio support" section. 10 "ALSA for SoC audio support" section.
11 11
12config SND_PXA2XX_LIB
13 tristate
14 select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
15 select SND_DMAENGINE_PCM
16
17config SND_PXA2XX_LIB_AC97
18 bool
19
20if SND_ARM 12if SND_ARM
21 13
22config SND_ARMAACI 14config SND_ARMAACI
@@ -42,3 +34,10 @@ config SND_PXA2XX_AC97
42 34
43endif # SND_ARM 35endif # SND_ARM
44 36
37config SND_PXA2XX_LIB
38 tristate
39 select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
40 select SND_DMAENGINE_PCM
41
42config SND_PXA2XX_LIB_AC97
43 bool