diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-29 14:19:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-29 14:19:09 -0500 |
commit | 77148625e10d0fda50d05e92d199c0df17b66e9a (patch) | |
tree | fdb5bb1e06933dc8891a3c4d3c93c371801d8b37 /drivers/net/wireless/zd1211rw | |
parent | a41778694806ac1ccd4b1dafed1abef8d5ba98ac (diff) | |
parent | 51cce8a590c4696d62bfacc63378d1036084cef7 (diff) |
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')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 4 |
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 dd0bb0cc22d9..6a9b66051cf7 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, | |||
1449 | */ | 1449 | */ |
1450 | int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value) | 1450 | int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value) |
1451 | { | 1451 | { |
1452 | struct zd_ioreq16 ioreqs[] = { | 1452 | const struct zd_ioreq16 ioreqs[] = { |
1453 | { CR244, (value >> 16) & 0xff }, | 1453 | { CR244, (value >> 16) & 0xff }, |
1454 | { CR243, (value >> 8) & 0xff }, | 1454 | { CR243, (value >> 8) & 0xff }, |
1455 | { CR242, value & 0xff }, | 1455 | { CR242, value & 0xff }, |
@@ -1476,7 +1476,7 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip, | |||
1476 | int zd_chip_set_multicast_hash(struct zd_chip *chip, | 1476 | int zd_chip_set_multicast_hash(struct zd_chip *chip, |
1477 | struct zd_mc_hash *hash) | 1477 | struct zd_mc_hash *hash) |
1478 | { | 1478 | { |
1479 | struct zd_ioreq32 ioreqs[] = { | 1479 | const struct zd_ioreq32 ioreqs[] = { |
1480 | { CR_GROUP_HASH_P1, hash->low }, | 1480 | { CR_GROUP_HASH_P1, hash->low }, |
1481 | { CR_GROUP_HASH_P2, hash->high }, | 1481 | { CR_GROUP_HASH_P2, hash->high }, |
1482 | }; | 1482 | }; |