Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index eb72c67699ab..8831a3393ecf 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -275,7 +275,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         dev->base_addr = ioaddr+WD_NIC_OFFSET;
 
         if (dev->irq < 2) {
-                int irqmap[] = {9,3,5,7,10,11,15,4};
+                static const int irqmap[] = {9, 3, 5, 7, 10, 11, 15, 4};
                 int reg1 = inb(ioaddr+1);
                 int reg4 = inb(ioaddr+4);
                 if (ancient || reg1 == 0xff) {  /* Ack!! No way to read the IRQ! */
@@ -342,10 +342,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         printk(" %s, IRQ %d, shared memory at %#lx-%#lx.\n",
                    model_name, dev->irq, dev->mem_start, dev->mem_end-1);
 
-        ei_status.reset_8390 = &wd_reset_8390;
-        ei_status.block_input = &wd_block_input;
-        ei_status.block_output = &wd_block_output;
-        ei_status.get_8390_hdr = &wd_get_8390_hdr;
+        ei_status.reset_8390 = wd_reset_8390;
+        ei_status.block_input = wd_block_input;
+        ei_status.block_output = wd_block_output;
+        ei_status.get_8390_hdr = wd_get_8390_hdr;
 
         dev->netdev_ops = &wd_netdev_ops;
         NS8390_init(dev, 0);