---

yaml --- r: 230962 b: refs/heads/master c: 7f5db6a h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · ac67f0f · ac67f0f
1 parent 38faaec
commit ac67f0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c72a04e34735ec3f19f4788b7f95017310b5e1eb
+refs/heads/master: 7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b
diff --git a/trunk/drivers/gpio/timbgpio.c b/trunk/drivers/gpio/timbgpio.c
@@ -193,13 +193,13 @@ static int timbgpio_irq_type(struct irq_data *d, unsigned trigger)
 	return ret;
 }
 
-static void timbgpio_irq(struct irq_data *d, struct irq_desc *desc)
+static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
 {
-	struct timbgpio *tgpio = irq_data_get_irq_data(d);
+	struct timbgpio *tgpio = get_irq_data(irq);
 	unsigned long ipr;
 	int offset;
 
-	desc->irq_data.chip->ack(irq_get_irq_data(d));
+	desc->irq_data.chip->irq_ack(irq_get_irq_data(irq));
 	ipr = ioread32(tgpio->membase + TGPIO_IPR);
 	iowrite32(ipr, tgpio->membase + TGPIO_ICR);