diff --git a/[refs] b/[refs]
index 3c678c40198e..68f5d70f3ce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c5728edbeb44819dba25a3c1b56702c87c9e419
+refs/heads/master: abda3a24a99998279fe890ea8a789ebe4d605d78
diff --git a/trunk/drivers/mfd/tc3589x.c b/trunk/drivers/mfd/tc3589x.c
index 32291fe4151c..112efd3c4940 100644
--- a/trunk/drivers/mfd/tc3589x.c
+++ b/trunk/drivers/mfd/tc3589x.c
@@ -170,17 +170,6 @@ static irqreturn_t tc3589x_irq(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static void tc3589x_irq_dummy(unsigned int irq)
-{
-	/* No mask/unmask at this level */
-}
-
-static struct irq_chip tc3589x_irq_chip = {
-	.name	= "tc3589x",
-	.mask	= tc3589x_irq_dummy,
-	.unmask	= tc3589x_irq_dummy,
-};
-
 static int tc3589x_irq_init(struct tc3589x *tc3589x)
 {
 	int base = tc3589x->irq_base;
@@ -188,7 +177,7 @@ static int tc3589x_irq_init(struct tc3589x *tc3589x)
 
 	for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
 		set_irq_chip_data(irq, tc3589x);
-		set_irq_chip_and_handler(irq, &tc3589x_irq_chip,
+		set_irq_chip_and_handler(irq, &dummy_irq_chip,
 					 handle_edge_irq);
 		set_irq_nested_thread(irq, 1);
 #ifdef CONFIG_ARM