diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-29 19:44:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-29 19:44:25 -0800 |
| commit | 7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch) | |
| tree | e2135eddba600910cdebb54c8b01de53473ecefb /drivers/net/wireless/wl12xx/wl1271_cmd.c | |
| parent | 96c5340147584481ef0c0afbb5423f7563c1d24a (diff) | |
| parent | 55afc80b2ab100618c17af77915f75307b6bd5d1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c index 886a9bc39cc..c3385b3d246 100644 --- a/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c @@ -777,7 +777,7 @@ out: return ret; } -static int wl1271_build_basic_rates(char *rates, u8 band) +static int wl1271_build_basic_rates(u8 *rates, u8 band) { u8 index = 0; @@ -804,7 +804,7 @@ static int wl1271_build_basic_rates(char *rates, u8 band) return index; } -static int wl1271_build_extended_rates(char *rates, u8 band) +static int wl1271_build_extended_rates(u8 *rates, u8 band) { u8 index = 0; |