diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-01 10:15:30 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2017-03-01 15:15:10 +0100 |
| commit | 9297b652bd0a11e29251ffaac93369b8ad45932d (patch) | |
| tree | eed295b59ffd28dfba91a4bb2b101fc0e77f7aeb /drivers/watchdog | |
| parent | watchdog: kempld: fix gcc-4.3 build (diff) | |
| download | linux-9297b652bd0a11e29251ffaac93369b8ad45932d.tar.xz linux-9297b652bd0a11e29251ffaac93369b8ad45932d.zip | |
watchdog: db8500: add back prmcu dependency
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 47dbacf3bfb4..a199e8536ce4 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -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 |