From 1f1ff1febaf8f77ff5201720e1026fd13a3bc13b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 13 Jul 2011 22:33:13 +0200 Subject: [PATCH] --- yaml --- r: 280019 b: refs/heads/master c: e71ef315ddb96c239d6d8323008ac0b5ef6cee99 h: refs/heads/master i: 280017: da399f490d853158c62dc8945c1a0dc2c8b1f8fc 280015: 06fa24ba9a19de69f69429695af450d3851b1be8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/natsemi/macsonic.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 91f1b7e108c2..590f0a466196 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c51a0c6a3bc974d42d6ea5e15c0a00e1eb87fc2 +refs/heads/master: e71ef315ddb96c239d6d8323008ac0b5ef6cee99 diff --git a/trunk/drivers/net/ethernet/natsemi/macsonic.c b/trunk/drivers/net/ethernet/natsemi/macsonic.c index a2eacbfb4252..5987d172d3d6 100644 --- a/trunk/drivers/net/ethernet/natsemi/macsonic.c +++ b/trunk/drivers/net/ethernet/natsemi/macsonic.c @@ -142,8 +142,7 @@ static int macsonic_open(struct net_device* dev) { int retval; - retval = request_irq(dev->irq, sonic_interrupt, IRQ_FLG_FAST, - "sonic", dev); + retval = request_irq(dev->irq, sonic_interrupt, 0, "sonic", dev); if (retval) { printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); @@ -154,8 +153,8 @@ static int macsonic_open(struct net_device* dev) * rupt as well, which must prevent re-entrance of the sonic handler. */ if (dev->irq == IRQ_AUTO_3) { - retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt, - IRQ_FLG_FAST, "sonic", dev); + retval = request_irq(IRQ_NUBUS_9, macsonic_interrupt, 0, + "sonic", dev); if (retval) { printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, IRQ_NUBUS_9);