diff options
| author | Yegor Yefremov <yegor_sub1@visionsystems.de> | 2010-03-19 01:49:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 04:33:37 +0100 |
| commit | abde89d7f57adfae5a43f086b45e5746be16e3f0 (patch) | |
| tree | d3bb3c0ca508e07f25df44da9c806ce37f4c54a0 /drivers | |
| parent | pktgen node allocation (diff) | |
| download | linux-abde89d7f57adfae5a43f086b45e5746be16e3f0.tar.xz linux-abde89d7f57adfae5a43f086b45e5746be16e3f0.zip | |
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')
| -rw-r--r-- | drivers/net/can/sja1000/sja1000_platform.c | 2 |
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) 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; |