git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline (v2.6.34-rc7)
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
prom_irqtrans.c
diff --git
a/arch/sparc/kernel/prom_irqtrans.c
b/arch/sparc/kernel/prom_irqtrans.c
index
96958c4
..
5702ad4
100644
(file)
--- a/
arch/sparc/kernel/prom_irqtrans.c
+++ b/
arch/sparc/kernel/prom_irqtrans.c
@@
-346,7
+346,7
@@
static void tomatillo_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)
break;
}
if (limit <= 0) {
- printk("tomatillo_wsync_handler: DMA won't sync [%l
x:%
lx]\n",
+ printk("tomatillo_wsync_handler: DMA won't sync [%l
lx:%l
lx]\n",
val, mask);
}