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

[mv-sheeva.git] / drivers / net / smc-ultra.c

diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index d2dd8e6113ab9be23121d7a4f061acfcd305e420..235a3c6c9f915d38ae78433ac1b9237930b5edd7 100644 (file)
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -277,8 +277,12 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
        dev->base_addr = ioaddr+ULTRA_NIC_OFFSET;
 
        {
-               int addr_tbl[4] = {0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000};
-               short num_pages_tbl[4] = {0x20, 0x40, 0x80, 0xff};
+               static const int addr_tbl[4] = {
+                       0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000
+               };
+               static const short num_pages_tbl[4] = {
+                       0x20, 0x40, 0x80, 0xff
+               };
 
                dev->mem_start = ((addr & 0x0f) << 13) + addr_tbl[(addr >> 6) & 3] ;
                num_pages = num_pages_tbl[(addr >> 4) & 3];