Skip to contentSkip to conversation

watchdog - Fixes for v3.14-rc2

GIT PULL Wim Van Sebroeck 1 participant 1 message Feb 8, 2014 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git

It will fix the HAS_IOMEM dependency for dw_wdt.

This will update the following files:

 Kconfig |    1 +
 1 files changed, 1 insertion(+)

with these Changes:

commit 1ccfe6f982674e4b7bd832b904bafcb3db890252

Author: Richard Weinberger <[email protected]>
Date:   Fri Jan 31 13:47:34 2014 +0100

watchdog: dw_wdt: Add dependency on HAS_IOMEM

On archs like S390 or um this driver cannot build nor work. Make it depend on HAS_IOMEM to bypass build failures.

drivers/built-in.o: In function `dw_wdt_drv_probe':
drivers/watchdog/dw_wdt.c:302: undefined reference to `devm_ioremap_resource'

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================

drivers/watchdog/Kconfig +1 -0
index 4c4c566..79d2589 100644
@@ -223,6 +223,7 @@ config SA1100_WATCHDOG
 
 config DW_WATCHDOG
 	tristate "Synopsys DesignWare watchdog"
+	depends on HAS_IOMEM
 	help
 	  Say Y here if to include support for the Synopsys DesignWare
 	  watchdog timer found in many chips.