diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:30:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:30:27 +0200 |
| commit | 5a9c1e12e09f6da185ea1efb29047da5a0c877da (patch) | |
| tree | 054f6287b88076e49fdede8c7520a3444f9b2a99 /arch/arm/configs/multi_v7_defconfig | |
| parent | dbd540fea0c5396e0213540e4fa24bd794ddbff9 (diff) | |
| parent | f6982786df61513c3614c91d492f3c1b21da6128 (diff) | |
| download | op-kernel-dev-5a9c1e12e09f6da185ea1efb29047da5a0c877da.zip op-kernel-dev-5a9c1e12e09f6da185ea1efb29047da5a0c877da.tar.gz | |
Merge tag 'tegra-for-4.14-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig
Pull "ARM: tegra: Default configuration updates for v4.14-rc1" from Thierry Reding:
Enables the ChipIdea UDC driver and selects some symbols that were
previously being selected by other drivers but will no longer be in
v4.14.
* tag 'tegra-for-4.14-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: defconfig: tegra: Enable ChipIdea UDC driver
ARM: configs: Add Tegra I2S interfaces to multi_v7_defconfig
ARM: tegra: Add Tegra I2S interfaces to defconfig
ARM: tegra: Update default configuration for v4.13-rc1
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 906d60e..cb1830bb 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -653,6 +653,8 @@ CONFIG_SND_SOC_RCAR=m CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SUN4I_CODEC=m CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA20_I2S=m +CONFIG_SND_SOC_TEGRA30_I2S=m CONFIG_SND_SOC_TEGRA_RT5640=m CONFIG_SND_SOC_TEGRA_WM8753=m CONFIG_SND_SOC_TEGRA_WM8903=m |
