diff --git a/[refs] b/[refs] index 10e9024f9728..f512f1ef8790 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61307ed85dbf0ee232e354721a5a0a2011da7996 +refs/heads/master: e81259b4f7c69a71d92216ba551731fb7027bcbe diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index d273a0720ef1..6aa2b165de6a 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -1972,7 +1972,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF); retval = request_irq(dev->irq, smsc911x_irqhandler, - irq_flags | IRQF_DISABLED, dev->name, dev); + irq_flags | IRQF_SHARED, dev->name, dev); if (retval) { SMSC_WARNING(PROBE, "Unable to claim requested irq: %d", dev->irq);