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/core.h | |
| 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/core.h')
| -rw-r--r-- | drivers/staging/winbond/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h index eb4c090..7d4bd5e 100644 --- a/drivers/staging/winbond/core.h +++ b/drivers/staging/winbond/core.h @@ -18,9 +18,9 @@ struct wbsoft_priv { MLME_FRAME sMlmeFrame; // connect to peerSTA parameters - MTO_PARAMETERS sMtoPara; // MTO_struct ... + struct wb35_mto_params sMtoPara; // MTO_struct ... struct hw_data sHwData; //For HAL - MDS Mds; + struct wb35_mds Mds; spinlock_t SpinLock; |