Skip to content

Commit

Permalink
watchdog: db8500: add back prmcu dependency
Browse files Browse the repository at this point in the history
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: da2a68b ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Arnd Bergmann authored and Guenter Roeck committed Mar 1, 2017
1 parent 3736d4e commit 9297b65
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9297b65

Please sign in to comment.