Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index a31696a3928e..be9590253aa1 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -801,14 +801,14 @@ static int lance_open(struct net_device *dev)
         netif_start_queue(dev);
 
         /* Associate IRQ with lance_interrupt */
-        if (request_irq(dev->irq, &lance_interrupt, 0, "lance", dev)) {
+        if (request_irq(dev->irq, lance_interrupt, 0, "lance", dev)) {
                 printk("%s: Can't get IRQ %d\n", dev->name, dev->irq);
                 return -EAGAIN;
         }
         if (lp->dma_irq >= 0) {
                 unsigned long flags;
 
-                if (request_irq(lp->dma_irq, &lance_dma_merr_int, 0,
+                if (request_irq(lp->dma_irq, lance_dma_merr_int, 0,
                                 "lance error", dev)) {
                         free_irq(dev->irq, dev);
                         printk("%s: Can't get DMA IRQ %d\n", dev->name,