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/bfin_wdt.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/bfin_wdt.c')
-rw-r--r-- | drivers/watchdog/bfin_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 9042a95fc98c..b9fa9b71583a 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
@@ -63,7 +63,7 @@ static DEFINE_SPINLOCK(bfin_wdt_spinlock); | |||
63 | /** | 63 | /** |
64 | * bfin_wdt_keepalive - Keep the Userspace Watchdog Alive | 64 | * bfin_wdt_keepalive - Keep the Userspace Watchdog Alive |
65 | * | 65 | * |
66 | * The Userspace watchdog got a KeepAlive: schedule the next timeout. | 66 | * The Userspace watchdog got a KeepAlive: schedule the next timeout. |
67 | */ | 67 | */ |
68 | static int bfin_wdt_keepalive(void) | 68 | static int bfin_wdt_keepalive(void) |
69 | { | 69 | { |
@@ -337,7 +337,7 @@ static int bfin_wdt_resume(struct platform_device *pdev) | |||
337 | static const struct file_operations bfin_wdt_fops = { | 337 | static const struct file_operations bfin_wdt_fops = { |
338 | .owner = THIS_MODULE, | 338 | .owner = THIS_MODULE, |
339 | .llseek = no_llseek, | 339 | .llseek = no_llseek, |
340 | .write = bfin_wdt_write, | 340 | .write = bfin_wdt_write, |
341 | .unlocked_ioctl = bfin_wdt_ioctl, | 341 | .unlocked_ioctl = bfin_wdt_ioctl, |
342 | .open = bfin_wdt_open, | 342 | .open = bfin_wdt_open, |
343 | .release = bfin_wdt_release, | 343 | .release = bfin_wdt_release, |