git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
at91sam9_wdt.c
diff --git
a/drivers/watchdog/at91sam9_wdt.c
b/drivers/watchdog/at91sam9_wdt.c
index a56ac84381b1d3ad3a879cee04bfd657fe907565..435b0573fb0a4ba30060fca99fb04fe37d45d478 100644
(file)
--- a/
drivers/watchdog/at91sam9_wdt.c
+++ b/
drivers/watchdog/at91sam9_wdt.c
@@
-201,7
+201,7
@@
static long at91_wdt_ioctl(struct file *file,
* Pat the watchdog whenever device is written to.
*/
static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len,
- loff_t *ppos)
+
loff_t *ppos)
{
if (!len)
return 0;