diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-22 00:26:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-22 00:26:15 +0300 |
| commit | 503b1a529a6b62b31904bab4699752c523cf76b2 (patch) | |
| tree | c78d1850e9409295ad720b56ceb0d28efe9d0e39 /drivers/net/tokenring/ibmtr.c | |
| parent | 4b4f54670859074cf7670cc6fa96fe34a65846d9 (diff) | |
| parent | 215faf9c5f6e319e97edea9e178123e07825c14d (diff) | |
| download | linux-503b1a529a6b62b31904bab4699752c523cf76b2.tar.xz | |
Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods
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; |