From 4138eccd3410091e5100bf683f7afe3bdbe6459a Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 18 Nov 2009 08:20:44 +0000
Subject: [PATCH] --- yaml --- r: 171620 b: refs/heads/master c:
 4c9ba61e9e0212fd79da9a26f7b3d47de4a56a24 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/can/sja1000/sja1000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 443f7251f012..0b6c2b9ea093 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aff7e922b852036d864d039ce13ae1e38418b73
+refs/heads/master: 4c9ba61e9e0212fd79da9a26f7b3d47de4a56a24
diff --git a/trunk/drivers/net/can/sja1000/sja1000.c b/trunk/drivers/net/can/sja1000/sja1000.c
index 782a47fabf2c..b4ba88a31075 100644
--- a/trunk/drivers/net/can/sja1000/sja1000.c
+++ b/trunk/drivers/net/can/sja1000/sja1000.c
@@ -516,7 +516,7 @@ static int sja1000_open(struct net_device *dev)
 
 	/* register interrupt handler, if not done by the device driver */
 	if (!(priv->flags & SJA1000_CUSTOM_IRQ_HANDLER)) {
-		err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags,
+		err = request_irq(dev->irq, sja1000_interrupt, priv->irq_flags,
 				  dev->name, (void *)dev);
 		if (err) {
 			close_candev(dev);