diff options
-rw-r--r-- | sound/arm/Kconfig | 15 | ||||
-rw-r--r-- | sound/soc/pxa/Kconfig | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig index 885683a3b0bd..e0406211716b 100644 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig | |||
@@ -9,6 +9,14 @@ 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 | ||
12 | config SND_PXA2XX_LIB | ||
13 | tristate | ||
14 | select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97 | ||
15 | select SND_DMAENGINE_PCM | ||
16 | |||
17 | config SND_PXA2XX_LIB_AC97 | ||
18 | bool | ||
19 | |||
12 | if SND_ARM | 20 | if SND_ARM |
13 | 21 | ||
14 | config SND_ARMAACI | 22 | config SND_ARMAACI |
@@ -21,13 +29,6 @@ config SND_PXA2XX_PCM | |||
21 | tristate | 29 | tristate |
22 | select SND_PCM | 30 | select SND_PCM |
23 | 31 | ||
24 | config SND_PXA2XX_LIB | ||
25 | tristate | ||
26 | select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97 | ||
27 | |||
28 | config SND_PXA2XX_LIB_AC97 | ||
29 | bool | ||
30 | |||
31 | config SND_PXA2XX_AC97 | 32 | config SND_PXA2XX_AC97 |
32 | tristate "AC97 driver for the Intel PXA2xx chip" | 33 | tristate "AC97 driver for the Intel PXA2xx chip" |
33 | depends on ARCH_PXA | 34 | depends on ARCH_PXA |
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 39cea80846c3..f2bf8661dd21 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config SND_PXA2XX_SOC | 1 | config SND_PXA2XX_SOC |
2 | tristate "SoC Audio for the Intel PXA2xx chip" | 2 | tristate "SoC Audio for the Intel PXA2xx chip" |
3 | depends on ARCH_PXA | 3 | depends on ARCH_PXA |
4 | select SND_ARM | ||
5 | select SND_PXA2XX_LIB | 4 | select SND_PXA2XX_LIB |
6 | help | 5 | help |
7 | Say Y or M if you want to add support for codecs attached to | 6 | Say Y or M if you want to add support for codecs attached to |
@@ -25,7 +24,6 @@ config SND_PXA2XX_AC97 | |||
25 | config SND_PXA2XX_SOC_AC97 | 24 | config SND_PXA2XX_SOC_AC97 |
26 | tristate | 25 | tristate |
27 | select AC97_BUS | 26 | select AC97_BUS |
28 | select SND_ARM | ||
29 | select SND_PXA2XX_LIB_AC97 | 27 | select SND_PXA2XX_LIB_AC97 |
30 | select SND_SOC_AC97_BUS | 28 | select SND_SOC_AC97_BUS |
31 | 29 | ||