diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /sound/soc/tegra/Kconfig | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b (diff) | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de (diff) | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound/soc/tegra/Kconfig')
| -rw-r--r-- | sound/soc/tegra/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 02bcd308c189..19e5fe7cc403 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SND_SOC_TEGRA | 1 | config SND_SOC_TEGRA |
| 2 | tristate "SoC Audio for the Tegra System-on-Chip" | 2 | tristate "SoC Audio for the Tegra System-on-Chip" |
| 3 | depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA) | 3 | depends on ARCH_TEGRA && TEGRA20_APB_DMA |
| 4 | select REGMAP_MMIO | 4 | select REGMAP_MMIO |
| 5 | select SND_SOC_DMAENGINE_PCM if TEGRA20_APB_DMA | 5 | select SND_SOC_DMAENGINE_PCM if TEGRA20_APB_DMA |
| 6 | help | 6 | help |