---

yaml --- r: 193643 b: refs/heads/master c: abde89d h: refs/heads/master i: 193641: 5408841 193639: a3e1e9b v: v3
git-mirror · Mar 22, 2010 · 15d5994 · 15d5994
1 parent 7ef5d83
commit 15d5994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;