diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-26 15:28:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 15:28:40 -0800 |
| commit | b5ddedc9cc01b1d86015af08c5f1694191804530 (patch) | |
| tree | db08f24da9ef4dcec0976ee4de4d77e5e596057e /drivers/net/wireless/iwlwifi/iwl-io.h | |
| parent | 244e6c2d0724bc4908a1995804704bdee3b31528 (diff) | |
| parent | b235507cc5e552b9e75678d596727249e8fba01b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index 40e0050b7536..bc10435d96e5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h @@ -109,7 +109,7 @@ static inline int __iwl_poll_bit(const char *f, u32 l, int ret = _iwl_poll_bit(priv, addr, bits, mask, timeout); IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n", addr, bits, mask, - unlikely(ret == -ETIMEDOUT)?"timeout":"", f, l); + unlikely(ret == -ETIMEDOUT) ? "timeout" : "", f, l); return ret; } #define iwl_poll_bit(priv, addr, bits, mask, timeout) \ |