Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f2773a29596d835d2b00137ba925c186699ea117
Commit:     f2773a29596d835d2b00137ba925c186699ea117
Parent:     1af7f05628fab81fdf4412d757676412ba5db660
Author:     Vitaly Wool <[EMAIL PROTECTED]>
AuthorDate: Sun May 13 18:42:08 2007 +0400
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue May 15 17:44:39 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 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 81f2484..db43e42 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to