[3/3] ASoC: Samsung: Disable build on multiplatform

Message ID 1390560804-31135-3-git-send-email-sachin.kamat@linaro.org
State Changes Requested
Headers show

Commit Message

Sachin Kamat Jan. 24, 2014, 10:53 a.m.
Samsung sound drivers use mach/dma.h which is not available
on multiplatform. Hence disable audio support on multiplatform
build for now. Without this patch we get the following build errors:

sound/soc/samsung/pcm.c:23:22: fatal error: mach/dma.h: No such file or directory
 #include <mach/dma.h>
sound/soc/samsung/spdif.c:21:22: fatal error: mach/dma.h: No such file or directory
 #include <mach/dma.h>

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 sound/soc/samsung/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Sachin Kamat Jan. 24, 2014, 11:55 a.m. | #1
On 24 January 2014 17:02, Mark Brown <broonie@kernel.org> wrote:
> On Fri, Jan 24, 2014 at 04:23:24PM +0530, Sachin Kamat wrote:
>> Samsung sound drivers use mach/dma.h which is not available
>> on multiplatform. Hence disable audio support on multiplatform
>> build for now. Without this patch we get the following build errors:
>
> No, the thing to do here is fix the multiplatform build.

Yes this is only masking the build error temporarily until the code
becomes multi-platform aware.
Since legacy code is involved in this, I am not aware if it is going
to happen sooner than later.

Patch

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index e8fbf4e5732f..3a031af5febd 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -170,7 +170,7 @@  config SND_SOC_GONI_AQUILA_WM8994
 
 config SND_SOC_SAMSUNG_SMDK_SPDIF
 	tristate "SoC S/PDIF Audio support for SMDK"
-	depends on SND_SOC_SAMSUNG
+	depends on SND_SOC_SAMSUNG && !ARCH_MULTIPLATFORM
 	select SND_SAMSUNG_SPDIF
 	help
 	  Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
@@ -185,7 +185,7 @@  config SND_SOC_SMDK_WM8580_PCM
 
 config SND_SOC_SMDK_WM8994_PCM
 	tristate "SoC PCM Audio support for WM8994 on SMDK"
-	depends on SND_SOC_SAMSUNG
+	depends on SND_SOC_SAMSUNG && !ARCH_MULTIPLATFORM
 	depends on I2C=y
 	select MFD_WM8994
 	select SND_SOC_WM8994