diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rt2870/common/rtusb_io.c | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2870/common/rtusb_io.c')
| -rw-r--r-- | drivers/staging/rt2870/common/rtusb_io.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c index 6b9ca24..7d2f7e0 100644 --- a/drivers/staging/rt2870/common/rtusb_io.c +++ b/drivers/staging/rt2870/common/rtusb_io.c @@ -1879,13 +1879,10 @@ void CMDHandler(struct rt_rtmp_adapter *pAd) AsicUpdateRxWCIDTable(pAd, pEntry->Aid, pEntry->Addr); DBGPRINT(RT_DEBUG_TRACE, - ("UpdateRxWCIDTable(): Aid=%d, Addr=%02x:%02x:%02x:%02x:%02x:%02x!\n", - pEntry->Aid, pEntry->Addr[0], - pEntry->Addr[1], - pEntry->Addr[2], - pEntry->Addr[3], - pEntry->Addr[4], - pEntry->Addr[5])); + ("UpdateRxWCIDTable(): Aid=%d, " + "Addr=%pM!\n", + pEntry->Aid, + pEntry->Addr)); } break; |
