diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
| commit | e569aa78ba01f7f66e016a4d57310fd041524d17 (patch) | |
| tree | eaedc03d42ee2bf6200fc07b080a99bad103def3 /drivers/net/wireless/ipw2x00 | |
| parent | 4562487a00445eab96311365ba15c41dc4d043cd (diff) | |
| parent | 268bae0b6879f238ba57f5f801958d1254e136f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 2ba57340083c..61915f371416 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
| @@ -3056,9 +3056,9 @@ static void ipw2100_tx_send_commands(struct ipw2100_priv *priv) | |||
| 3056 | 3056 | ||
| 3057 | packet = list_entry(element, struct ipw2100_tx_packet, list); | 3057 | packet = list_entry(element, struct ipw2100_tx_packet, list); |
| 3058 | 3058 | ||
| 3059 | IPW_DEBUG_TX("using TBD at virt=%p, phys=%p\n", | 3059 | IPW_DEBUG_TX("using TBD at virt=%p, phys=%04X\n", |
| 3060 | &txq->drv[txq->next], | 3060 | &txq->drv[txq->next], |
| 3061 | (void *)(txq->nic + txq->next * | 3061 | (u32) (txq->nic + txq->next * |
| 3062 | sizeof(struct ipw2100_bd))); | 3062 | sizeof(struct ipw2100_bd))); |
| 3063 | 3063 | ||
| 3064 | packet->index = txq->next; | 3064 | packet->index = txq->next; |