watchdog: sp805: add back AMBA dependency
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2017 21:01:21 +0000 (22:01 +0100)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 1 Mar 2017 14:15:10 +0000 (06:15 -0800)
The driver fails to link if ARM_AMBA is disabled:

drivers/watchdog/sp805_wdt.o: In function `sp805_wdt_driver_init':
sp805_wdt.c:(.init.text+0x4): undefined reference to `amba_driver_register'

It seems that the COMPILE_TEST was added in the wrong place, as there
is no architecture dependency, but a bus dependency. This moves
the dependency accordingly.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/Kconfig

index 4d2c336daa394c01e7b1f1a1b04b7efef9a04ad8..41a75b8ab213047f10a018a1cd3a3dec4dee679b 100644 (file)
@@ -218,7 +218,7 @@ config ZIIRAVE_WATCHDOG
 
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"
-       depends on (ARM || ARM64) && (ARM_AMBA || COMPILE_TEST)
+       depends on (ARM || ARM64 || COMPILE_TEST) && ARM_AMBA
        select WATCHDOG_CORE
        help
          ARM Primecell SP805 Watchdog timer. This will reboot your system when