commit e397a78589e03ce920e0b4e5f8cc2cfa49027058
author Maxime Ripard <maxime.ripard@free-electrons.com> Tue May 06 21:44:24 2014 -0500
committer Maxime Ripard <maxime.ripard@free-electrons.com> Fri May 23 10:39:49 2014 +0200
tree 1ed167289afab44cc741555a04c6455a9b15a4f2
parent 9daf6c51518ce78aae8324949695dd084ec46ebd

ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig

Now that the reset code are part of drivers of their own, we need those in the
defconfig.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

arch/arm/configs/multi_v7_defconfig

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d4e8a47..960187a 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -200,12 +200,14 @@
 CONFIG_CHARGER_TPS65090=y
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_SUN6I=y
 CONFIG_SENSORS_LM90=y
 CONFIG_THERMAL=y
 CONFIG_DOVE_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y