Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wd.c

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index f1549fff0edc981662addc0a486cfd1b069c3e5f..8831a3393ecf7bf60dfa02efbc2a0271ca531185 100644 (file)
--- 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! */