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/wan/dscc4.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/wan/dscc4.c')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index d45b08d1dbc9..34cff6ce6d27 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -1358,7 +1358,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return ret; } -static int dscc4_match(struct thingie *p, int value) +static int dscc4_match(const struct thingie *p, int value) { int i; @@ -1403,7 +1403,7 @@ done: static int dscc4_encoding_setting(struct dscc4_dev_priv *dpriv, struct net_device *dev) { - struct thingie encoding[] = { + static const struct thingie encoding[] = { { ENCODING_NRZ, 0x00000000 }, { ENCODING_NRZI, 0x00200000 }, { ENCODING_FM_MARK, 0x00400000 }, @@ -1442,7 +1442,7 @@ static int dscc4_loopback_setting(struct dscc4_dev_priv *dpriv, static int dscc4_crc_setting(struct dscc4_dev_priv *dpriv, struct net_device *dev) { - struct thingie crc[] = { + static const struct thingie crc[] = { { PARITY_CRC16_PR0_CCITT, 0x00000010 }, { PARITY_CRC16_PR1_CCITT, 0x00000000 }, { PARITY_CRC32_PR0_CCITT, 0x00000011 }, |