Merge tag 'tegra-for-4.14-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc arch/arm/configs/multi_v7_defconfig
index 906d60e48f0f53c2805f3e65a6fc868292a7065f,626cecdada61eea6817f9825f6fd3e89b898af5c..cb1830bb7ce5c4a7f6a007ac818ff6147f382a82
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -650,9 -650,11 +650,11 @@@ CONFIG_SND_SOC_SMDK_WM8994_PCM=
  CONFIG_SND_SOC_SNOW=m
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
 -CONFIG_SND_SOC_RSRC_CARD=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