diff --git a/[refs] b/[refs] index 803ca0a6eabe..cfe6750093ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23e55a32ca1ffdbe7a492ef99f0e0ac48e504a13 +refs/heads/master: f47aeffd6089ed7a0cd18073e88cd505f188b0b7 diff --git a/trunk/drivers/net/lib8390.c b/trunk/drivers/net/lib8390.c index 00d59ab2f8ac..f80dcc11fe26 100644 --- a/trunk/drivers/net/lib8390.c +++ b/trunk/drivers/net/lib8390.c @@ -530,9 +530,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) #ifdef CONFIG_NET_POLL_CONTROLLER static void __ei_poll(struct net_device *dev) { - disable_irq_lockdep(dev->irq); + disable_irq(dev->irq); __ei_interrupt(dev->irq, dev); - enable_irq_lockdep(dev->irq); + enable_irq(dev->irq); } #endif