Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2773a29 authored by Vitaly Wool's avatar Vitaly Wool Committed by Jeff Garzik
Browse files

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: default avatarVitaly Wool <vitalywool@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1af7f056

drivers/net/smc911x.c

+2 −4
Original line number Diff line number Diff line
@@ -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);