diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-08 15:26:20 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 14:18:02 +0000 |
| commit | 82b04af1bae93f7f8aa76248592f1bc11e6f3e7e (patch) | |
| tree | 7a05481d77a4acbc1313e418763c6e2e7d258e64 /sound | |
| parent | 305f6a740b297cba502e34ac33740f365af5c7bf (diff) | |
ARM: random randconfig fixes for testing multiplatform
These patches fix or work around problems that existed before
the multiplatform support got added. They should be addressed
one by one with an appropriate patch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-ssi.h | 2 | ||||
| -rw-r--r-- | sound/soc/omap/Kconfig | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index c5de0a84566f..40a5462e4cb5 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -7,6 +7,7 @@ menuconfig SND_SOC select SND_PCM select AC97_BUS if SND_SOC_AC97_BUS select SND_JACK if INPUT=y || INPUT=SND + depends on I2C || !I2C select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER ---help--- @@ -26,7 +27,7 @@ config SND_SOC_AC97_BUS bool config SND_SOC_DMAENGINE_PCM - bool + tristate # All the supported SoCs source "sound/soc/atmel/Kconfig" diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 48f9d886f020..c437fc32140a 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -30,7 +30,7 @@ #include <sound/soc.h> #include <sound/dmaengine_pcm.h> -#include <mach/dma.h> +#include <mach-imx/dma.h> #include "imx-pcm.h" diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index 5744e86ca878..c19f84dc072f 100644 --- a/sound/soc/fsl/imx-ssi.h +++ b/sound/soc/fsl/imx-ssi.h @@ -186,7 +186,7 @@ #define DRV_NAME "imx-ssi" #include <linux/dmaengine.h> -#include <mach/dma.h> +#include <mach-imx/dma.h> #include "imx-pcm.h" struct imx_ssi { diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 57a2fa751085..90237682d301 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -112,6 +112,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 config SND_OMAP_SOC_OMAP_HDMI tristate "SoC Audio support for Texas Instruments OMAP HDMI" depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS + depends on BROKEN select SND_OMAP_SOC_HDMI select SND_SOC_OMAP_HDMI_CODEC select OMAP4_DSS_HDMI_AUDIO |