From: Olof Johansson Date: Fri, 21 Aug 2015 01:59:45 +0000 (-0700) Subject: Merge tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: Ubuntu-5.0.0-8.9~8794^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ba5d183bced6cb60b2838a0bf04665c1c1e4bff1;p=mirror_ubuntu-disco-kernel.git Merge tag 'tegra-for-4.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig 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 --- ba5d183bced6cb60b2838a0bf04665c1c1e4bff1 diff --cc arch/arm/configs/multi_v7_defconfig index 3f49d8fd31f5,01b7c68858e5..824a0cff3998 --- a/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