* [PATCH] ASoC: omap: Fix incorrect ARM dependency
@ 2013-10-01 18:20 Jarkko Nikula
2013-10-03 16:01 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Nikula @ 2013-10-01 18:20 UTC (permalink / raw)
To: alsa-devel; +Cc: Peter Ujfalusi, Mark Brown, Liam Girdwood, Jarkko Nikula
Commit b0e0a4d ("ASoC: omap: Enable COMPILE_TEST build for DT platforms")
added two incorrect CONFIG_ARCH_ARM dependencies making impossible to select
audio support for Nokia RX-51. Fix this by using correct CONFIG_ARM.
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
---
This is a fix for 3.12-rc. I.e. not for next merge window.
---
sound/soc/omap/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index daa78a0..4a07f71 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -1,6 +1,6 @@
config SND_OMAP_SOC
tristate "SoC Audio for the Texas Instruments OMAP chips"
- depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST)
+ depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)
select SND_DMAENGINE_PCM
config SND_OMAP_SOC_DMIC
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810
config SND_OMAP_SOC_RX51
tristate "SoC Audio support for Nokia RX-51"
- depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
+ depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
select SND_OMAP_SOC_MCBSP
select SND_SOC_TLV320AIC3X
select SND_SOC_TPA6130A2
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ASoC: omap: Fix incorrect ARM dependency
2013-10-01 18:20 [PATCH] ASoC: omap: Fix incorrect ARM dependency Jarkko Nikula
@ 2013-10-03 16:01 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2013-10-03 16:01 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: Peter Ujfalusi, alsa-devel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 307 bytes --]
On Tue, Oct 01, 2013 at 09:20:50PM +0300, Jarkko Nikula wrote:
> Commit b0e0a4d ("ASoC: omap: Enable COMPILE_TEST build for DT platforms")
> added two incorrect CONFIG_ARCH_ARM dependencies making impossible to select
> audio support for Nokia RX-51. Fix this by using correct CONFIG_ARM.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-03 16:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 18:20 [PATCH] ASoC: omap: Fix incorrect ARM dependency Jarkko Nikula
2013-10-03 16:01 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).