diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
| commit | b740e76936c14354a9c5676a3eed839ea8472c41 (patch) | |
| tree | dd0b74f64007dba28fcf12595af893e367d307ff /drivers/watchdog/cadence_wdt.c | |
| parent | drm/atomic-helper: Simplify commit tracking locking (diff) | |
| parent | Backmerge tag 'v4.12-rc7' into drm-next (diff) | |
| download | linux-b740e76936c14354a9c5676a3eed839ea8472c41.tar.xz linux-b740e76936c14354a9c5676a3eed839ea8472c41.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Required for Daniel's drm_vblank_cleanup cleanup
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
| -rw-r--r-- | drivers/watchdog/cadence_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index 8d61e8bfe60b..86e0b5d2e761 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -49,7 +49,7 @@ /* Counter maximum value */ #define CDNS_WDT_COUNTER_MAX 0xFFF -static int wdt_timeout = CDNS_WDT_DEFAULT_TIMEOUT; +static int wdt_timeout; static int nowayout = WATCHDOG_NOWAYOUT; module_param(wdt_timeout, int, 0); |