diff --git a/[refs] b/[refs]
index 3bee8708e889..adcfe77e5f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 313af42b5b3ea105567e8a62b01f35a9245c3fb3
+refs/heads/master: 9a99d55514d3c6bfc03e41536659d781af6998f5
diff --git a/trunk/drivers/gpio/pl061.c b/trunk/drivers/gpio/pl061.c
index 5ad8f778ced4..cc3b5e0b595a 100644
--- a/trunk/drivers/gpio/pl061.c
+++ b/trunk/drivers/gpio/pl061.c
@@ -204,7 +204,7 @@ static struct irq_chip pl061_irqchip = {
 
 static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
 {
-	struct list_head *chip_list = get_irq_chip_data(irq);
+	struct list_head *chip_list = get_irq_data(irq);
 	struct list_head *ptr;
 	struct pl061_gpio *chip;
 
@@ -297,9 +297,9 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
 			goto iounmap;
 		}
 		INIT_LIST_HEAD(chip_list);
-		set_irq_chip_data(irq, chip_list);
+		set_irq_data(irq, chip_list);
 	} else
-		chip_list = get_irq_chip_data(irq);
+		chip_list = get_irq_data(irq);
 	list_add(&chip->list, chip_list);
 
 	for (i = 0; i < PL061_GPIO_NR; i++) {