diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-31 00:44:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-31 00:44:30 +0200 |
| commit | e62112c53acfefc67ccfbdc1895eebccf866bc1b (patch) | |
| tree | 46c99ef13fc1764016ca8d2bb749f252f70cfab9 /drivers/net/enc28j60.c | |
| parent | net: Make "networking" one-click deselectable. (diff) | |
| parent | drivers/net/ehea/ehea_main.c: Release mutex in error handling code (diff) | |
| download | linux-e62112c53acfefc67ccfbdc1895eebccf866bc1b.tar.xz linux-e62112c53acfefc67ccfbdc1895eebccf866bc1b.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/enc28j60.c')
| -rw-r--r-- | drivers/net/enc28j60.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index c05cb159c772..aa0bf6e1c694 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -1547,8 +1547,10 @@ static int __devinit enc28j60_probe(struct spi_device *spi) random_ether_addr(dev->dev_addr); enc28j60_set_hw_macaddr(dev); - ret = request_irq(spi->irq, enc28j60_irq, IRQF_TRIGGER_FALLING, - DRV_NAME, priv); + /* Board setup must set the relevant edge trigger type; + * level triggers won't currently work. + */ + ret = request_irq(spi->irq, enc28j60_irq, 0, DRV_NAME, priv); if (ret < 0) { if (netif_msg_probe(priv)) dev_err(&spi->dev, DRV_NAME ": request irq %d failed " |