diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-06-11 11:06:08 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-12 11:34:13 +0100 |
| commit | 9cf08a6561dda1385d58357abd17d32f2d95ed3e (patch) | |
| tree | 9e8bec006482d1beaffda22793410f2df60698b8 | |
| parent | 0ef9dc139db2fca304ce4eadb5b8fb40d3dedb5e (diff) | |
| download | op-kernel-dev-9cf08a6561dda1385d58357abd17d32f2d95ed3e.zip op-kernel-dev-9cf08a6561dda1385d58357abd17d32f2d95ed3e.tar.gz | |
ASoC: atmel: Revert previous fix for Kconfig limations
After discussing with the Kconfig maintainer, we found a better fiw
allowing to keep each driver as modules.
This reverts commit 0ef9dc139db2fca304ce4eadb5b8fb40d3dedb5e.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/atmel/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/atmel/Makefile | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index c315207..93abe4e 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -9,10 +9,10 @@ config SND_ATMEL_SOC if SND_ATMEL_SOC config SND_ATMEL_SOC_PDC - bool + tristate config SND_ATMEL_SOC_DMA - bool + tristate select SND_SOC_GENERIC_DMAENGINE_PCM config SND_ATMEL_SOC_SSC diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile index 4fa7ac9..b327e5c 100644 --- a/sound/soc/atmel/Makefile +++ b/sound/soc/atmel/Makefile @@ -1,8 +1,10 @@ # AT91 Platform Support -snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_PDC) := atmel-pcm-pdc.o -snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o -snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o $(snd-soc-atmel-pcm-y) +snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o +snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o +snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o +obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o +obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o # AT91 Machine Support |
