diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-10 02:18:16 +0300 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-10 02:18:16 +0300 |
| commit | acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 (patch) | |
| tree | 2da3a61b6726707a89f1cf93446aabd2fb00e1f0 /drivers/net/tokenring/ibmtr.c | |
| parent | 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
| download | linux-acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3.tar.xz | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 91e6c78271a3..4786497de03e 100644 --- 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; |