diff options
| author | Vitaly Wool | 2007-05-13 16:42:08 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2007-05-15 23:44:39 +0200 |
| commit | f2773a29596d835d2b00137ba925c186699ea117 (patch) | |
| tree | ef62588e9bcef131429a45f13e10e7f864edd811 | |
| parent | pasemi_mac: Fix local-mac-address parsing (diff) | |
| download | kernel-qcow2-linux-f2773a29596d835d2b00137ba925c186699ea117.tar.gz kernel-qcow2-linux-f2773a29596d835d2b00137ba925c186699ea117.tar.xz kernel-qcow2-linux-f2773a29596d835d2b00137ba925c186699ea117.zip | |
smc911x: fix compilation breakage
Looks like the new version of this patch has been overlooked,
so I'm resending it.
It just adapts the driver to the new IRQ API
according to what Russell has pointed out.
drivers/net/smc911x.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/smc911x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 81f24847c963..db43e42bee35 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -77,7 +77,6 @@ static const char version[] = #include <linux/skbuff.h> #include <asm/io.h> -#include <asm/irq.h> #include "smc911x.h" @@ -2084,12 +2083,11 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr) lp->ctl_rspeed = 100; /* Grab the IRQ */ - retval = request_irq(dev->irq, &smc911x_interrupt, IRQF_SHARED, dev->name, dev); + retval = request_irq(dev->irq, &smc911x_interrupt, + IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev); if (retval) goto err_out; - set_irq_type(dev->irq, IRQT_FALLING); - #ifdef SMC_USE_DMA lp->rxdma = SMC_DMA_REQUEST(dev, smc911x_rx_dma_irq); lp->txdma = SMC_DMA_REQUEST(dev, smc911x_tx_dma_irq); |