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 branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
mach-fs
/
arbiter.c
diff --git
a/arch/cris/arch-v32/mach-fs/arbiter.c
b/arch/cris/arch-v32/mach-fs/arbiter.c
index
82ef293
..
3f8ebb5
100644
(file)
--- a/
arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/
arch/cris/arch-v32/mach-fs/arbiter.c
@@
-395,7
+395,7
@@
static irqreturn_t crisv32_arbiter_irq(int irq, void *dev_id)
REG_WR(marb_bp, watch->instance, rw_ack, ack);
REG_WR(marb, regi_marb, rw_ack_intr, ack_intr);
REG_WR(marb_bp, watch->instance, rw_ack, ack);
REG_WR(marb, regi_marb, rw_ack_intr, ack_intr);
- printk(KERN_INFO "IRQ occured at %lX\n", get_irq_regs()->erp);
+ printk(KERN_INFO "IRQ occur
r
ed at %lX\n", get_irq_regs()->erp);
if (watch->cb)
watch->cb();
if (watch->cb)
watch->cb();