projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] mv643xx_eth: Remove needless mask of extended intr register
[powerpc.git]
/
drivers
/
net
/
smc91x.c
diff --git
a/drivers/net/smc91x.c
b/drivers/net/smc91x.c
index
1021108
..
7ec0812
100644
(file)
--- a/
drivers/net/smc91x.c
+++ b/
drivers/net/smc91x.c
@@
-88,7
+88,6
@@
static const char version[] =
#include <linux/skbuff.h>
#include <asm/io.h>
#include <linux/skbuff.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include "smc91x.h"
#include "smc91x.h"
@@
-1212,6
+1211,7
@@
static void smc_phy_configure(void *data)
smc_phy_check_media(dev, 1);
smc_phy_configure_exit:
smc_phy_check_media(dev, 1);
smc_phy_configure_exit:
+ SMC_SELECT_BANK(2);
spin_unlock_irq(&lp->lock);
lp->work_pending = 0;
}
spin_unlock_irq(&lp->lock);
lp->work_pending = 0;
}
@@
-2006,12
+2006,10
@@
static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
}
/* Grab the IRQ */
}
/* Grab the IRQ */
- retval = request_irq(dev->irq, &smc_interrupt,
0
, dev->name, dev);
+ retval = request_irq(dev->irq, &smc_interrupt,
SMC_IRQ_FLAGS
, dev->name, dev);
if (retval)
goto err_out;
if (retval)
goto err_out;
- set_irq_type(dev->irq, SMC_IRQ_TRIGGER_TYPE);
-
#ifdef SMC_USE_PXA_DMA
{
int dma = pxa_request_dma(dev->name, DMA_PRIO_LOW,
#ifdef SMC_USE_PXA_DMA
{
int dma = pxa_request_dma(dev->name, DMA_PRIO_LOW,