summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_chip.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-29 11:19:09 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-29 11:19:09 -0800
commit77148625e10d0fda50d05e92d199c0df17b66e9a (patch)
treefdb5bb1e06933dc8891a3c4d3c93c371801d8b37 /drivers/net/wireless/zd1211rw/zd_chip.c
parenta41778694806ac1ccd4b1dafed1abef8d5ba98ac (diff)
parent51cce8a590c4696d62bfacc63378d1036084cef7 (diff)
downloadop-kernel-dev-77148625e10d0fda50d05e92d199c0df17b66e9a.zip
op-kernel-dev-77148625e10d0fda50d05e92d199c0df17b66e9a.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index dd0bb0c..6a9b660 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1449,7 +1449,7 @@ int zd_rfwritev_locked(struct zd_chip *chip,
*/
int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value)
{
- struct zd_ioreq16 ioreqs[] = {
+ const struct zd_ioreq16 ioreqs[] = {
{ CR244, (value >> 16) & 0xff },
{ CR243, (value >> 8) & 0xff },
{ CR242, value & 0xff },
@@ -1476,7 +1476,7 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip,
int zd_chip_set_multicast_hash(struct zd_chip *chip,
struct zd_mc_hash *hash)
{
- struct zd_ioreq32 ioreqs[] = {
+ const struct zd_ioreq32 ioreqs[] = {
{ CR_GROUP_HASH_P1, hash->low },
{ CR_GROUP_HASH_P2, hash->high },
};
OpenPOWER on IntegriCloud