diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/omap_wdt.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/omap_wdt.h')
| -rw-r--r-- | drivers/watchdog/omap_wdt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h index fc02ec6a0386..09b774cf75b9 100644 --- a/drivers/watchdog/omap_wdt.h +++ b/drivers/watchdog/omap_wdt.h | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | * months before firing. These limits work without scaling, | 44 | * months before firing. These limits work without scaling, |
| 45 | * with the 60 second default assumed by most tools and docs. | 45 | * with the 60 second default assumed by most tools and docs. |
| 46 | */ | 46 | */ |
| 47 | #define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */ | 47 | #define TIMER_MARGIN_MAX (24 * 60 * 60) /* 1 day */ |
| 48 | #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */ | 48 | #define TIMER_MARGIN_DEFAULT 60 /* 60 secs */ |
| 49 | #define TIMER_MARGIN_MIN 1 | 49 | #define TIMER_MARGIN_MIN 1 |
| 50 | 50 | ||