projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[cascardo/linux.git]
/
kernel
/
trace
/
trace_mmiotrace.c
diff --git
a/kernel/trace/trace_mmiotrace.c
b/kernel/trace/trace_mmiotrace.c
index
f095916
..
8e37fcd
100644
(file)
--- a/
kernel/trace/trace_mmiotrace.c
+++ b/
kernel/trace/trace_mmiotrace.c
@@
-359,5
+359,5
@@
void mmio_trace_mapping(struct mmiotrace_map *map)
int mmio_trace_printk(const char *fmt, va_list args)
{
- return trace_vprintk(0,
-1,
fmt, args);
+ return trace_vprintk(0, fmt, args);
}