From b649f8b5676201bb347b478a2ef2791ccaf0937a Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Oct 2010 15:11:01 +0900
Subject: [PATCH] --- yaml --- r: 219583 b: refs/heads/master c:
 79c981283ba344f7f51b6aa82e1b8e71bad123b4 h: refs/heads/master i:   219581:
 5a2906a894b8fbb2d098a1d8f021ff46a82898fb   219579:
 a13c8ec5d48cfbe7b14940adb11b5c8872c8e358   219575:
 d00fc80ceaa9a9270a3c86247039baa089126dc1   219567:
 176b59af3aeb8a759d7775cb784d61dc4f12d745   219551:
 47784a03a755b034423f0397e177b6a028bcc37f   219519:
 6812e63ff1de85d83412aaf482080d4736bf95b4 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/sh/boards/mach-x3proto/gpio.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a0653ab7f66..aabcab59d839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0103847325dc22fda8749626b56f8b71b98440
+refs/heads/master: 79c981283ba344f7f51b6aa82e1b8e71bad123b4
diff --git a/trunk/arch/sh/boards/mach-x3proto/gpio.c b/trunk/arch/sh/boards/mach-x3proto/gpio.c
index 594adf76e46a..239e74066253 100644
--- a/trunk/arch/sh/boards/mach-x3proto/gpio.c
+++ b/trunk/arch/sh/boards/mach-x3proto/gpio.c
@@ -54,18 +54,19 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
 
 static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
-	struct irq_chip *chip = get_irq_desc_chip(desc);
+	struct irq_data *data = irq_get_irq_data(irq);
+	struct irq_chip *chip = irq_data_get_irq_chip(data);
 	unsigned long mask;
 	int pin;
 
-	chip->mask_ack(irq);
+	chip->irq_mask_ack(data);
 
 	mask = __raw_readw(KEYDETR);
 
 	for_each_set_bit(pin, &mask, NR_BASEBOARD_GPIOS)
 		generic_handle_irq(x3proto_gpio_to_irq(NULL, pin));
 
-	chip->unmask(irq);
+	chip->irq_unmask(data);
 }
 
 struct gpio_chip x3proto_gpio_chip = {