diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-03 13:12:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-03 13:12:09 +1000 |
| commit | e7ae5379ecd395d3f1e1c80f93cda8b970a83df2 (patch) | |
| tree | 6a0ef3ddad191a719290d8920a4b08fc8f8a58fd /include | |
| parent | ba8702a2f4387db17ee1075673593d66e4269bea (diff) | |
| parent | cf20f1450ea41fd3caf7a68323a4177083392978 (diff) | |
Merge remote-tracking branch 'watchdog/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/watchdog.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 2a3038ee17a3..395b70e0eccf 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -97,13 +97,8 @@ struct watchdog_device { #define WDOG_UNREGISTERED 4 /* Has the device been unregistered */ }; -#ifdef CONFIG_WATCHDOG_NOWAYOUT -#define WATCHDOG_NOWAYOUT 1 -#define WATCHDOG_NOWAYOUT_INIT_STATUS (1 << WDOG_NO_WAY_OUT) -#else -#define WATCHDOG_NOWAYOUT 0 -#define WATCHDOG_NOWAYOUT_INIT_STATUS 0 -#endif +#define WATCHDOG_NOWAYOUT IS_BUILTIN(CONFIG_WATCHDOG_NOWAYOUT) +#define WATCHDOG_NOWAYOUT_INIT_STATUS (WATCHDOG_NOWAYOUT << WDOG_NO_WAY_OUT) /* Use the following function to check whether or not the watchdog is active */ static inline bool watchdog_active(struct watchdog_device *wdd) |