Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / tahvo.c

diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c
index edf7082c60a860df4238af0afb618fb3b7ebd92d..bc7a4b6c69ad253e463ed8a658efc0cb702a88e0 100644 (file)
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -331,7 +331,7 @@ static int __devinit tahvo_probe(struct device *dev)
        omap_set_gpio_direction(tahvo_irq_pin, 1);
 
        /* Rising edge triggers the IRQ */
-       set_irq_type(OMAP_GPIO_IRQ(tahvo_irq_pin), IRQT_RISING);
+       set_irq_type(OMAP_GPIO_IRQ(tahvo_irq_pin), IRQ_TYPE_EDGE_RISING);
 
        /* Mask all TAHVO interrupts */
        tahvo_write_reg(TAHVO_REG_IMR, 0xffff);