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

ARM: tegra: Default configuration updates for v4.3-rc1

Enable the GK20A GPU (via the Nouveau driver) and CPU frequency scaling
on Tegra124.

* tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update multi_v7_defconfig
  ARM: tegra: Update default configuration

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
index 3f49d8fd31f59b3e360f72bd5df755fde957f3e8,01b7c68858e55859ea0ac1dc9c80fcd967a4898c..824a0cff39987622cbb243b965342024bcfbff76
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -376,8 -371,8 +376,9 @@@ CONFIG_ARM_SP805_WATCHDOG=
  CONFIG_ORION_WATCHDOG=y
  CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
+ CONFIG_TEGRA_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=y
 +CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_BCM590XX=y