diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-17 20:40:08 -0700 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-17 20:40:08 -0700 |
| commit | 2f8d01a1475cfede058c6a92b5d3dad576da2827 (patch) | |
| tree | e004311de4c4c4075e91ca317a19983e2a612209 /drivers/net/ethernet/marvell/pxa168_eth.c | |
| parent | 82ea046c95a3c3ddcfa058c8a270b9afb6e93700 (diff) | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
Merge remote-tracking branch 'kvm/next' into kvm-arm-next
Diffstat (limited to 'drivers/net/ethernet/marvell/pxa168_eth.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 4ae0c7426010..fff62460185c 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -1123,8 +1123,7 @@ static int pxa168_eth_open(struct net_device *dev) struct pxa168_eth_private *pep = netdev_priv(dev); int err; - err = request_irq(dev->irq, pxa168_eth_int_handler, - IRQF_DISABLED, dev->name, dev); + err = request_irq(dev->irq, pxa168_eth_int_handler, 0, dev->name, dev); if (err) { dev_err(&dev->dev, "can't assign irq\n"); return -EAGAIN; |