diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /drivers/net/smc91x.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | drivers/net/smc91x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 28bf2e69eb5e..7ec08127c9d6 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -88,7 +88,6 @@ static const char version[] = | |||
| 88 | #include <linux/skbuff.h> | 88 | #include <linux/skbuff.h> |
| 89 | 89 | ||
| 90 | #include <asm/io.h> | 90 | #include <asm/io.h> |
| 91 | #include <asm/irq.h> | ||
| 92 | 91 | ||
| 93 | #include "smc91x.h" | 92 | #include "smc91x.h" |
| 94 | 93 | ||
| @@ -2007,12 +2006,10 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr) | |||
| 2007 | } | 2006 | } |
| 2008 | 2007 | ||
| 2009 | /* Grab the IRQ */ | 2008 | /* Grab the IRQ */ |
| 2010 | retval = request_irq(dev->irq, &smc_interrupt, 0, dev->name, dev); | 2009 | retval = request_irq(dev->irq, &smc_interrupt, SMC_IRQ_FLAGS, dev->name, dev); |
| 2011 | if (retval) | 2010 | if (retval) |
| 2012 | goto err_out; | 2011 | goto err_out; |
| 2013 | 2012 | ||
| 2014 | set_irq_type(dev->irq, SMC_IRQ_TRIGGER_TYPE); | ||
| 2015 | |||
| 2016 | #ifdef SMC_USE_PXA_DMA | 2013 | #ifdef SMC_USE_PXA_DMA |
| 2017 | { | 2014 | { |
| 2018 | int dma = pxa_request_dma(dev->name, DMA_PRIO_LOW, | 2015 | int dma = pxa_request_dma(dev->name, DMA_PRIO_LOW, |