aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-06-14 11:58:03 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:34 +0200
commit3d0533f6292f43ebb1eb6adabb3df80f4aec08e7 (patch)
tree7167583b73660e1a422f8c29b349a7e90aa6c096 /arch/arm/configs
parenteefb1f48cd64af76e8b20d4610cabbfc2355fc14 (diff)
ARM: ux500: Add platform data for prcmu watchdog
ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: 339924 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I952da9c66e20183fb45ee2d67164e75152863ce8 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25030 Reviewed-by: QATEST Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/u8500_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 07c8f198f79..64295e21bae 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -165,7 +165,8 @@ CONFIG_SENSORS_DB8500=y
CONFIG_SENSORS_LSM303DLH=y
CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
-CONFIG_MPCORE_WATCHDOG=y
+CONFIG_UX500_WATCHDOG=y
+CONFIG_UX500_WATCHDOG_DEBUG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
CONFIG_AB5500_CORE=y