diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-04-28 23:29:11 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2020-05-25 08:55:45 +0200 |
| commit | b30c1a464c29baf646a5726d90ea3537e775ac85 (patch) | |
| tree | 10ba8a692a3f18c794c18d616f966dc77a588454 /drivers | |
| parent | watchdog: da9062: No need to ping manually before setting timeout (diff) | |
| download | linux-b30c1a464c29baf646a5726d90ea3537e775ac85.tar.xz linux-b30c1a464c29baf646a5726d90ea3537e775ac85.zip | |
watchdog: iTCO: fix link error
When the MFD driver is a loadable module, the watchdog driver fails
to get linked into the kernel:
drivers/watchdog/iTCO_wdt.o: In function `update_no_reboot_bit_pmc':
iTCO_wdt.c:(.text+0x54f): undefined reference to `intel_pmc_gcr_update'
The code is written to support operation without the MFD driver, so
add a Kconfig dependency that allows this, while disallowing the watchdog
to be built-in when the MFD driver is a module.
Fixes: 25f1ca31e230 ("platform/x86: intel_pmc_ipc: Convert to MFD")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20200428212959.2993304-1-arnd@arndb.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index a0399a5b2a30..b3ab5a4bc71a 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1218,6 +1218,7 @@ config ITCO_WDT depends on (X86 || IA64) && PCI select WATCHDOG_CORE depends on I2C || I2C=n + depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C ---help--- |