summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorValentin Rothberg <valentinrothberg@gmail.com>2016-12-02 10:42:49 +0100
committerFlorian Fainelli <f.fainelli@gmail.com>2017-01-12 16:03:12 -0800
commit91546c56624a79f4a8fd80bede6b5a38c0f0ad78 (patch)
treefc5dd9061e0a0b6c014560278cc2fcc1641df325 /arch/arm
parent321012faf5975a4679771d7478b22ed42095aa9d (diff)
downloadlinux-stable-91546c56624a79f4a8fd80bede6b5a38c0f0ad78.tar.gz
linux-stable-91546c56624a79f4a8fd80bede6b5a38c0f0ad78.tar.bz2
linux-stable-91546c56624a79f4a8fd80bede6b5a38c0f0ad78.zip
ARM: multi_v7_defconfig: set bcm47xx watchdog
Correct the bcm47xx watchdog option. The convention of bcm watchdogs is the _WDT suffix. Fixes: 8dace3040426 ("ARM: multi_v7_defconfig: Enable BCM47xx/BCM5301x drivers") Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6014a6be8459..028d2b70e3b5 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -471,7 +471,7 @@ CONFIG_MESON_WATCHDOG=y
CONFIG_DW_WATCHDOG=y
CONFIG_DIGICOLOR_WATCHDOG=y
CONFIG_BCM2835_WDT=y
-CONFIG_BCM47XX_WATCHDOG=y
+CONFIG_BCM47XX_WDT=y
CONFIG_BCM7038_WDT=m
CONFIG_BCM_KONA_WDT=y
CONFIG_MFD_ACT8945A=y