Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1590155

[PATCH 2/3] watchdog: db8500: add back prmcu dependency

From Arnd Bergmann <arnd@arndb.de>
Newsgroups linux.kernel
Subject [PATCH 2/3] watchdog: db8500: add back prmcu dependency
Date 2017-03-01 11:00 +0100
Message-ID <tg9d8-1fv-31@gated-at.bofh.it> (permalink)
References <tg9d7-1fv-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.9.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/3] remaining watchdog dependency fixes Arnd Bergmann <arnd@arndb.de> - 2017-03-01 11:00 +0100
  [PATCH 3/3] watchdog: retu: restore MFD dependency Arnd Bergmann <arnd@arndb.de> - 2017-03-01 11:00 +0100
    Re: [PATCH 3/3] watchdog: retu: restore MFD dependency Guenter Roeck <linux@roeck-us.net> - 2017-03-01 15:20 +0100
  [PATCH 2/3] watchdog: db8500: add back prmcu dependency Arnd Bergmann <arnd@arndb.de> - 2017-03-01 11:00 +0100
    Re: [PATCH 2/3] watchdog: db8500: add back prmcu dependency Guenter Roeck <linux@roeck-us.net> - 2017-03-01 15:20 +0100
  [PATCH 1/3] watchdog: kempld: fix gcc-4.3 build Arnd Bergmann <arnd@arndb.de> - 2017-03-01 11:00 +0100
    Re: [PATCH 1/3] watchdog: kempld: fix gcc-4.3 build Guenter Roeck <linux@roeck-us.net> - 2017-03-01 15:20 +0100

csiph-web