watchdog: wm831x watchdog really needs mfd
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2017 21:01:18 +0000 (22:01 +0100)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 1 Mar 2017 14:15:10 +0000 (06:15 -0800)
The wm831x watchdog driver can now be built without the wm831x mfd
driver, which results in a link error:

(.text+0x1a95c): undefined reference to `wm831x_set_bits'
(.text+0x1a95c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_set_bits'
(.text+0x1a968): undefined reference to `wm831x_reg_lock'
(.text+0x1a968): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_lock'
(.text+0x1a9dc): undefined reference to `wm831x_reg_unlock'
(.text+0x1a9dc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_unlock'

This adds back the dependency that was removed. We can still build test
this driver on all architectures by enabling the MFD driver for it first.

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 c831b7967bf95f46139b55792e6d249a5c5812b2..fda6f3d24780ca5205f5366ac9aea4c911984ed6 100644 (file)
@@ -176,7 +176,7 @@ config WDAT_WDT
 
 config WM831X_WATCHDOG
        tristate "WM831x watchdog"
-       depends on MFD_WM831X || COMPILE_TEST
+       depends on MFD_WM831X
        select WATCHDOG_CORE
        help
          Support for the watchdog in the WM831x AudioPlus PMICs.  When