From 15d59948912318d483322e35bf3d29ac344dc2b0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 19 Mar 2010 00:49:08 +0000 Subject: [PATCH] --- yaml --- r: 193643 b: refs/heads/master c: abde89d7f57adfae5a43f086b45e5746be16e3f0 h: refs/heads/master i: 193641: 5408841cef99ed754dba55269c0b4604bf820733 193639: a3e1e9ba1662b59f9f8f124b463993920b31b1bb v: v3 --- [refs] | 2 +- trunk/drivers/net/can/sja1000/sja1000_platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57c1b09b96b3..34ab4a530904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e99b99b471c21b071132e51bb7aa6b7a8796dc02 +refs/heads/master: abde89d7f57adfae5a43f086b45e5746be16e3f0 diff --git a/trunk/drivers/net/can/sja1000/sja1000_platform.c b/trunk/drivers/net/can/sja1000/sja1000_platform.c index 628374c2a05f..bec0d3d99fe3 100644 --- a/trunk/drivers/net/can/sja1000/sja1000_platform.c +++ b/trunk/drivers/net/can/sja1000/sja1000_platform.c @@ -90,7 +90,7 @@ static int sp_probe(struct platform_device *pdev) priv = netdev_priv(dev); dev->irq = res_irq->start; - priv->irq_flags = res_irq->flags & IRQF_TRIGGER_MASK; + priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED); priv->reg_base = addr; priv->read_reg = sp_read_reg; priv->write_reg = sp_write_reg;