Merge branch 'master' into for-linus

[mv-sheeva.git] / drivers / staging / winbond / mlmetxrx_f.h

diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index d69da410c5579f38a2dbfa1986529a63515b4388..6c04e3e03e3116b3a41c808b65bd8ccd901f4b37 100644 (file)
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ b/drivers/staging/winbond/mlmetxrx_f.h
@@ -10,7 +10,7 @@
 
 #include "core.h"
 
-void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR pDes);
+void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes);
 u8 MLMESendFrame(struct wbsoft_priv *adapter,
                 u8 * pMMPDU, u16 len, u8 DataType);