diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/winbond/wb35tx.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/winbond/wb35tx.c')
| -rw-r--r-- | drivers/staging/winbond/wb35tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c index 1e4169d..5869ef4 100644 --- a/drivers/staging/winbond/wb35tx.c +++ b/drivers/staging/winbond/wb35tx.c @@ -30,7 +30,7 @@ static void Wb35Tx_complete(struct urb * pUrb) struct wbsoft_priv *adapter = pUrb->context; struct hw_data * pHwData = &adapter->sHwData; struct wb35_tx *pWb35Tx = &pHwData->Wb35Tx; - PMDS pMds = &adapter->Mds; + struct wb35_mds *pMds = &adapter->Mds; printk("wb35: tx complete\n"); // Variable setting @@ -67,7 +67,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter) struct hw_data * pHwData = &adapter->sHwData; struct wb35_tx *pWb35Tx = &pHwData->Wb35Tx; u8 *pTxBufferAddress; - PMDS pMds = &adapter->Mds; + struct wb35_mds *pMds = &adapter->Mds; struct urb * pUrb = (struct urb *)pWb35Tx->Tx4Urb; int retv; u32 SendIndex; |