summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-05-07 06:44:24 +0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-05-23 12:39:49 +0400
commite397a78589e03ce920e0b4e5f8cc2cfa49027058 (patch)
tree1ed167289afab44cc741555a04c6455a9b15a4f2 /arch/arm/configs
parent9daf6c51518ce78aae8324949695dd084ec46ebd (diff)
downloadlinux-e397a78589e03ce920e0b4e5f8cc2cfa49027058.tar.xz
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>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d4e8a47a2f7c..960187ac35e0 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -200,12 +200,14 @@ CONFIG_BATTERY_SBS=y
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