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

[mv-sheeva.git] / drivers / net / tokenring / ibmtr.c

diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 91e6c78271a3a09f4b8a5e4aba0b508e6f1ee134..4786497de03eec0aef53ac9125462a45abe33f41 100644 (file)
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -657,8 +657,9 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
 #ifndef PCMCIA
        /* finish figuring the shared RAM address */
        if (cardpresent == TR_ISA) {
-               static __u32 ram_bndry_mask[] =
-                       { 0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000 };
+               static const __u32 ram_bndry_mask[] = {
+                       0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000
+               };
                __u32 new_base, rrr_32, chk_base, rbm;
 
                rrr_32=readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03;