diff --git a/[refs] b/[refs]
index f688a7964c59..7bfaf1ce3d16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1db0b427eec6f18477fa95aab8edf6176dffcea4
+refs/heads/master: c45c685c1a582e27787b5aa85844f2ee6986018c
diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c
index 06c8955907e9..4082ed73613f 100644
--- a/trunk/drivers/mfd/twl6030-irq.c
+++ b/trunk/drivers/mfd/twl6030-irq.c
@@ -332,7 +332,7 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
 	 */
 	twl6030_irq_chip = dummy_irq_chip;
 	twl6030_irq_chip.name = "twl6030";
-	twl6030_irq_chip.set_type = NULL;
+	twl6030_irq_chip.irq_set_type = NULL;
 
 	for (i = irq_base; i < irq_end; i++) {
 		set_irq_chip_and_handler(i, &twl6030_irq_chip,