Skip to contentSkip to conversation

smc911x: fix compilation breakage

patch/resend Applied Vitaly Wool 2 participants 2 messages May 13, 2007 – May 15, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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(-)
drivers/net/smc911x.c +0 -0
index c956141..4b9bdad 100644
@@ -77,7 +77,6 @@ static const char version[] =

#include <linux/skbuff.h>

#include <asm/io.h>
-#include <asm/irq.h>

#include "smc911x.h"

@@ -2086,12 +2085,11 @@ static int __init smc911x_probe(struct n

	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);
Applied
#1 lore raw
Quoted 10 lines · Vitaly Wool

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(-)

applied to #upstream-fixes