Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9297b652 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Guenter Roeck
Browse files

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: da2a68b3 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 3736d4eb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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