diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
| commit | 9c6115822e894ead72fa4c094bf718eaabb9e103 (patch) | |
| tree | 4f8843a5cfbe2895a168d96dee111dd31e443b2a /include/watchdog.h | |
| parent | 5939afc9611e8ba4a86b96e67670b765ee27668e (diff) | |
| parent | 0805fe151d8c47cfbcfddf71c0891ed4f3c10b56 (diff) | |
Merge branch '2019-08-11-ti-imports'
- More DaVinci updates and fixes
- PCIe support on am65x
- Watchdog converted to DM
- Assorted other bugfixes
Diffstat (limited to 'include/watchdog.h')
| -rw-r--r-- | include/watchdog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index 3a357de903f..a4a4e8e614e 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -77,7 +77,7 @@ int init_func_watchdog_reset(void); * Prototypes from $(CPU)/cpu.c. */ -#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__) +#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__) void hw_watchdog_init(void); #endif |