diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-06-14 11:58:03 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:18:09 +0200 |
| commit | 50e89271fe90a737bc4f0ff6b598e4baa0106143 (patch) | |
| tree | a980dbbef6e01477abe22f0679dd840a945518a3 /arch/arm/configs/u8500_defconfig | |
| parent | 102ff23c2c09006cf59125bc94f054592b171e0e (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/u8500_defconfig')
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 864e3bb5a07..eb22af7fa1f 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -160,7 +160,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 |