projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.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/davem/net-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
watchdog
/
shwdt.c
diff --git
a/drivers/watchdog/shwdt.c
b/drivers/watchdog/shwdt.c
index
61dde86
..
1277f7e
100644
(file)
--- a/
drivers/watchdog/shwdt.c
+++ b/
drivers/watchdog/shwdt.c
@@
-298,7
+298,7
@@
static int sh_wdt_mmap(struct file *file, struct vm_area_struct *vma)
if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
PAGE_SIZE, vma->vm_page_prot)) {
printk(KERN_ERR PFX "%s: io_remap_pfn_range failed\n",
- __
FUNCTION
__);
+ __
func
__);
return -EAGAIN;
}