Merge branch 'sfc-3.9' into master

[karo-tx-linux.git] / arch / mips / kernel / cevt-bcm1480.c

diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c
index 69bbfae183bcfafd46f4c4b559e3368233085df2..15f618b40cf6c1dcaf8f8c835f7e2d1f7d89382a 100644 (file)
--- a/arch/mips/kernel/cevt-bcm1480.c
+++ b/arch/mips/kernel/cevt-bcm1480.c
@@ -41,7 +41,7 @@
  * the rest of the system
  */
 static void sibyte_set_mode(enum clock_event_mode mode,
-                           struct clock_event_device *evt)
+                          struct clock_event_device *evt)
 {
        unsigned int cpu = smp_processor_id();
        void __iomem *cfg, *init;
@@ -144,7 +144,7 @@ void __cpuinit sb1480_clockevent_init(void)
 
        bcm1480_unmask_irq(cpu, irq);
 
-       action->handler = sibyte_counter_handler;
+       action->handler = sibyte_counter_handler;
        action->flags   = IRQF_PERCPU | IRQF_TIMER;
        action->name    = name;
        action->dev_id  = cd;