Merge remote-tracking branch 'samsung/for-next'

[karo-tx-linux.git] / drivers / of / irq.c

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index f5fa5d84aa062c63c4ee13c1840eaa97e67f2326..90068f91491152da9d6445bd50cfbec1a5e163b0 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -354,7 +354,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
                                              &name);
 
                r->start = r->end = irq;
-               r->flags = IORESOURCE_IRQ;
+               r->flags = IORESOURCE_IRQ | irqd_get_trigger_type(irq_get_irq_data(irq));
                r->name = name ? name : of_node_full_name(dev);
        }