diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/ath/ar9170/cmd.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/cmd.h')
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/cmd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar9170/cmd.h b/drivers/net/wireless/ath/ar9170/cmd.h index a4f0e50e52b4..826c45e6b274 100644 --- a/drivers/net/wireless/ath/ar9170/cmd.h +++ b/drivers/net/wireless/ath/ar9170/cmd.h | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | int ar9170_write_mem(struct ar9170 *ar, const __le32 *data, size_t len); | 44 | int ar9170_write_mem(struct ar9170 *ar, const __le32 *data, size_t len); |
| 45 | int ar9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val); | 45 | int ar9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val); |
| 46 | int ar9170_read_reg(struct ar9170 *ar, u32 reg, u32 *val); | 46 | int ar9170_read_reg(struct ar9170 *ar, u32 reg, u32 *val); |
| 47 | int ar9170_read_mreg(struct ar9170 *ar, int nregs, const u32 *regs, u32 *out); | ||
| 47 | int ar9170_echo_test(struct ar9170 *ar, u32 v); | 48 | int ar9170_echo_test(struct ar9170 *ar, u32 v); |
| 48 | 49 | ||
| 49 | /* | 50 | /* |