diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/wireless/ath9k/hw.h | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/wireless/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath9k/hw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/hw.h b/drivers/net/wireless/ath9k/hw.h index 89936a038da3..dc681f011fdf 100644 --- a/drivers/net/wireless/ath9k/hw.h +++ b/drivers/net/wireless/ath9k/hw.h | |||
| @@ -42,8 +42,8 @@ | |||
| 42 | #define AR5416_MAGIC 0x19641014 | 42 | #define AR5416_MAGIC 0x19641014 |
| 43 | 43 | ||
| 44 | /* Register read/write primitives */ | 44 | /* Register read/write primitives */ |
| 45 | #define REG_WRITE(_ah, _reg, _val) iowrite32(_val, _ah->ah_sc->mem + _reg) | 45 | #define REG_WRITE(_ah, _reg, _val) ath9k_iowrite32((_ah), (_reg), (_val)) |
| 46 | #define REG_READ(_ah, _reg) ioread32(_ah->ah_sc->mem + _reg) | 46 | #define REG_READ(_ah, _reg) ath9k_ioread32((_ah), (_reg)) |
| 47 | 47 | ||
| 48 | #define SM(_v, _f) (((_v) << _f##_S) & _f) | 48 | #define SM(_v, _f) (((_v) << _f##_S) & _f) |
| 49 | #define MS(_v, _f) (((_v) & _f) >> _f##_S) | 49 | #define MS(_v, _f) (((_v) & _f) >> _f##_S) |