Messages in this thread Patch in this message | | | Date | Sat, 8 Feb 2014 09:50:53 +0100 | From | Wim Van Sebroeck <> | Subject | [GIT PULL REQUEST] watchdog - Fixes for v3.14-rc2 |
| |
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 <richard@nod.at> 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' Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
For completeness, I added the overal diff below.
Greetings, Wim.
================================================================================ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 4c4c566..79d2589 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -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.
| |