watchdog: db8500: add back prmcu dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 1 Mar 2017 09:15:30 +0000 (10:15 +0100)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 1 Mar 2017 14:15:10 +0000 (06:15 -0800)
When the db8500 watchdog is enabled without the PRCMU, we get a lot of
warnings about duplicate or missing helper functions:

In file included from drivers/watchdog/ux500_wdt.c:21:0:
include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
 static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)

This restores the dependency as it was.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/Kconfig

index 47dbacf3bfb41cb9dc67291eea175bb478e11cf7..a199e8536ce49cc5a2568f3ad0e126af2df3a2b5 100644 (file)
@@ -574,7 +574,7 @@ config IMX2_WDT
 
 config UX500_WATCHDOG
        tristate "ST-Ericsson Ux500 watchdog"
-       depends on MFD_DB8500_PRCMU || (ARM && COMPILE_TEST)
+       depends on MFD_DB8500_PRCMU
        select WATCHDOG_CORE
        default y
        help