diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 14:18:46 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-16 14:18:46 +0000 |
| commit | 32d40f0cb312c3835a6e52256a60cd5507f8ed4d (patch) | |
| tree | bfdd2ac9b43e506b8e72c5d8786a998d04d8d755 /sound | |
| parent | 82b04af1bae93f7f8aa76248592f1bc11e6f3e7e (diff) | |
Revert "ARM: random randconfig fixes for testing multiplatform"tracking-multiplatform-llct-20120820.1tracking-multiplatform-llct-20120820.0tracking-multiplatform-llct-20120816.0
This reverts commit 82b04af1bae93f7f8aa76248592f1bc11e6f3e7e.
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, 3 insertions, 5 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 40a5462e4cb5..c5de0a84566f 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -7,7 +7,6 @@ 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--- @@ -27,7 +26,7 @@ config SND_SOC_AC97_BUS bool config SND_SOC_DMAENGINE_PCM - tristate + bool # 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 c437fc32140a..48f9d886f020 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-imx/dma.h> +#include <mach/dma.h> #include "imx-pcm.h" diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index c19f84dc072f..5744e86ca878 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-imx/dma.h> +#include <mach/dma.h> #include "imx-pcm.h" struct imx_ssi { diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 90237682d301..57a2fa751085 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -112,7 +112,6 @@ 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 |