Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / arch / cris / arch-v32 / mach-a3 / arbiter.c

diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c
index b92fd7e..15f5c9d 100644 (file)
--- a/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -3,7 +3,7 @@
  * arbiter and sets up arbiter breakpoints.
  *
  * The algorithm first assigns slots to the clients that has specified
- * bandwith (e.g. ethernet) and then the remaining slots are divided
+ * bandwidth (e.g. ethernet) and then the remaining slots are divided
  * on all the active clients.
  *
  * Copyright (c) 2004-2007 Axis Communications AB.
@@ -282,7 +282,7 @@ static void crisv32_arbiter_init(void)
        REG_WR_INT(marb_bar, regi_marb_bar, rw_l2cache_burst, 3);
 }
 
-int crisv32_arbiter_allocate_bandwith(int client, int region,
+int crisv32_arbiter_allocate_bandwidth(int client, int region,
                                      unsigned long bandwidth)
 {
        int i;
@@ -324,7 +324,7 @@ int crisv32_arbiter_allocate_bandwith(int client, int region,
 
        /* Propagate allocation from foo to bar */
        if (arbiter == 0)
-               crisv32_arbiter_allocate_bandwith(8 << 16,
+               crisv32_arbiter_allocate_bandwidth(8 << 16,
                        EXT_REGION, bandwidth);
        return 0;
 }
@@ -568,7 +568,7 @@ crisv32_foo_arbiter_irq(int irq, void *dev_id)
        REG_WR(marb_foo_bp, watch->instance, rw_ack, ack);
        REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr);
 
-       printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs());
+       printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs());
 
        if (watch->cb)
                watch->cb();
@@ -624,7 +624,7 @@ crisv32_bar_arbiter_irq(int irq, void *dev_id)
        REG_WR(marb_bar_bp, watch->instance, rw_ack, ack);
        REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr);
 
-       printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()->erp);
+       printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs()->erp);
 
        if (watch->cb)
                watch->cb();