diff --git a/[refs] b/[refs]
index 8d36123f0045..78b649df923e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1598b6adb0e7d9615f751f3bced128bcceb7378
+refs/heads/master: 46abf4b39a555294ec0df138923daed1ccb9adb5
diff --git a/trunk/arch/mips/sibyte/sb1250/time.c b/trunk/arch/mips/sibyte/sb1250/time.c
index 181a4139dead..e224fe7715c8 100644
--- a/trunk/arch/mips/sibyte/sb1250/time.c
+++ b/trunk/arch/mips/sibyte/sb1250/time.c
@@ -113,12 +113,6 @@ static irqreturn_t sibyte_counter_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static struct irqaction sibyte_irqaction = {
-	.handler	= sibyte_counter_handler,
-	.flags		= IRQF_DISABLED | IRQF_PERCPU,
-	.name		= "timer",
-};
-
 static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent);
 static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction);
 static DEFINE_PER_CPU(char [18], sibyte_hpt_name);
@@ -161,7 +155,7 @@ void __cpuinit sb1250_clockevent_init(void)
 	action->flags	= IRQF_DISABLED | IRQF_PERCPU;
 	action->name	= name;
 	action->dev_id	= cd;
-	setup_irq(irq, &sibyte_irqaction);
+	setup_irq(irq, &action);
 }
 
 /*