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

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

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 12c37d264108fec7290900d89cab3a63806f1f35..48ee51bb9e50fea0bae06852bc87b4ef60ba9a25 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1103,7 +1103,7 @@ static int __init eexp_hw_probe(struct net_device *dev, unsigned short ioaddr)
                dev->dev_addr[i] = ((unsigned char *)hw_addr)[5-i];
 
        {
-               static char irqmap[]={0, 9, 3, 4, 5, 10, 11, 0};
+               static const char irqmap[] = { 0, 9, 3, 4, 5, 10, 11, 0 };
                unsigned short setupval = eexp_hw_readeeprom(ioaddr,0);
 
                /* Use the IRQ from EEPROM if none was given */