[PATCH] watchdog: orion: don't build for ARCH_EBSA110

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The randconfig builder caught another corner case with this driver that
fails to build for EBSA110 since that has its own MMIO handlers and
lacks atomic_io_modify:

drivers/watchdog/orion_wdt.o: In function `orion_stop':
orion_wdt.c:(.text.orion_stop+0x28): undefined reference to `atomic_io_modify'
orion_wdt.c:(.text.orion_stop+0x3c): undefined reference to `atomic_io_modify'
drivers/watchdog/orion_wdt.o: In function `armada370_wdt_clock_init':
orion_wdt.c:(.text.armada370_wdt_clock_init+0x2c): undefined reference to `atomic_io_modify'
drivers/watchdog/orion_wdt.o: In function `armada375_stop':
orion_wdt.c:(.text.armada375_stop+0x28): undefined reference to `atomic_io_modify'
orion_wdt.c:(.text.armada375_stop+0x58): undefined reference to `atomic_io_modify'

The best workaround I can think of is to add another Kconfig dependency.
We could add atomic_io_modify() for ebsa110 in theory, but it seemed
wrong because that platform would never actually use it.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 52a70ee6014f..feead0dbfc55 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -453,7 +453,7 @@ config DAVINCI_WATCHDOG
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
 	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU || COMPILE_TEST
-	depends on ARM
+	depends on ARM && !ARCH_EBSA110
 	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer
-- 
2.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux