aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/mach-a3/arbiter.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /arch/cris/arch-v32/mach-a3/arbiter.c
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'arch/cris/arch-v32/mach-a3/arbiter.c')
-rw-r--r--arch/cris/arch-v32/mach-a3/arbiter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c
index 8b924db71c9a..15f5c9de2639 100644
--- a/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -568,7 +568,7 @@ crisv32_foo_arbiter_irq(int irq, void *dev_id)
568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack); 568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack);
569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr); 569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr);
570 570
571 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()); 571 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs());
572 572
573 if (watch->cb) 573 if (watch->cb)
574 watch->cb(); 574 watch->cb();
@@ -624,7 +624,7 @@ crisv32_bar_arbiter_irq(int irq, void *dev_id)
624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack); 624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack);
625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr); 625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr);
626 626
627 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()->erp); 627 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs()->erp);
628 628
629 if (watch->cb) 629 if (watch->cb)
630 watch->cb(); 630 watch->cb();