aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000
diff options
context:
space:
mode:
authorYegor Yefremov <yegor_sub1@visionsystems.de>2010-03-18 20:49:08 -0400
committerDavid S. Miller <davem@davemloft.net>2010-03-21 23:33:37 -0400
commitabde89d7f57adfae5a43f086b45e5746be16e3f0 (patch)
treed3bb3c0ca508e07f25df44da9c806ce37f4c54a0 /drivers/net/can/sja1000
parente99b99b471c21b071132e51bb7aa6b7a8796dc02 (diff)
can: sja1000: allow shared interrupt definition
extend the AND mask, so that IRQF_SHARED flag remains Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000')
-rw-r--r--drivers/net/can/sja1000/sja1000_platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 628374c2a05f..bec0d3d99fe3 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -90,7 +90,7 @@ static int sp_probe(struct platform_device *pdev)
90 priv = netdev_priv(dev); 90 priv = netdev_priv(dev);
91 91
92 dev->irq = res_irq->start; 92 dev->irq = res_irq->start;
93 priv->irq_flags = res_irq->flags & IRQF_TRIGGER_MASK; 93 priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED);
94 priv->reg_base = addr; 94 priv->reg_base = addr;
95 priv->read_reg = sp_read_reg; 95 priv->read_reg = sp_read_reg;
96 priv->write_reg = sp_write_reg; 96 priv->write_reg = sp_write_reg;