diff --git a/[refs] b/[refs] index 95dd7769efa0..c9b8e04d9d59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a974a679d252ed9629061b2a29dc639f4557ca70 +refs/heads/master: aa36ab8edb8a7e7be1f4cf99d0743e58e6249fb0 diff --git a/trunk/drivers/net/typhoon.c b/trunk/drivers/net/typhoon.c index d6d345229fe9..4b7541024424 100644 --- a/trunk/drivers/net/typhoon.c +++ b/trunk/drivers/net/typhoon.c @@ -2150,7 +2150,7 @@ typhoon_open(struct net_device *dev) goto out_sleep; } - err = request_irq(dev->irq, &typhoon_interrupt, IRQF_SHARED, + err = request_irq(dev->irq, typhoon_interrupt, IRQF_SHARED, dev->name, dev); if(err < 0) goto out_sleep;