diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
| commit | 69dccb494a0ee5fececc67f2b7afa7b79368a991 (patch) | |
| tree | 46be84e18d56a7d6a0b3d722cfb402cb93b2f3b3 /include | |
| parent | 049fb66d212caf2324e6ef2920c44b59858fc04d (diff) | |
| parent | dfd536eb3213a0c29121e0d343963e6fd9ea3111 (diff) | |
| download | barebox-69dccb494a0ee5fececc67f2b7afa7b79368a991.tar.gz barebox-69dccb494a0ee5fececc67f2b7afa7b79368a991.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/watchdog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/watchdog.h b/include/watchdog.h index 7e37b7c22a..7a98ae4434 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -27,12 +27,12 @@ static inline int watchdog_register(struct watchdog *w) return 0; } -int watchdog_deregister(struct watchdog *w) +static inline int watchdog_deregister(struct watchdog *w) { return 0; } -int watchdog_set_timeout(unsigned t) +static inline int watchdog_set_timeout(unsigned t) { return 0; } |