diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-02 01:08:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-02 01:08:51 -0400 |
| commit | e9e80ea5f2129e135e3a6fa260314b1c6d99b19a (patch) | |
| tree | db20dc85b0e620ea3fcaf86a9026d6df7cb2e168 /drivers/net/wireless/ipw2200.c | |
| parent | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (diff) | |
| parent | 56decd3c5758b0d776c073f65f777beb7a05ac0a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 846a7d051851..36e8d2f6e7b4 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -305,9 +305,10 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c) | |||
| 305 | #define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs)) | 305 | #define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs)) |
| 306 | 306 | ||
| 307 | /* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */ | 307 | /* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */ |
| 308 | #define ipw_write8(ipw, ofs, val) \ | 308 | #define ipw_write8(ipw, ofs, val) do { \ |
| 309 | IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \ | 309 | IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \ |
| 310 | _ipw_write8(ipw, ofs, val) | 310 | _ipw_write8(ipw, ofs, val); \ |
| 311 | } while (0) | ||
| 311 | 312 | ||
| 312 | /* 16-bit direct write (low 4K) */ | 313 | /* 16-bit direct write (low 4K) */ |
| 313 | #define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs)) | 314 | #define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs)) |