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/eurotechwdt.c | |
| 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/eurotechwdt.c')
| -rw-r--r-- | drivers/watchdog/eurotechwdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c index 3f3dc093ad68..f1d1da662fbe 100644 --- a/drivers/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c | |||
| @@ -201,7 +201,7 @@ static void eurwdt_ping(void) | |||
| 201 | static ssize_t eurwdt_write(struct file *file, const char __user *buf, | 201 | static ssize_t eurwdt_write(struct file *file, const char __user *buf, |
| 202 | size_t count, loff_t *ppos) | 202 | size_t count, loff_t *ppos) |
| 203 | { | 203 | { |
| 204 | if (count) { | 204 | if (count) { |
| 205 | if (!nowayout) { | 205 | if (!nowayout) { |
| 206 | size_t i; | 206 | size_t i; |
| 207 | 207 | ||