From 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 30 Oct 2008 16:14:38 +0200 Subject: Staging: w35und: merge struct wb35_adapter to struct wbsoft_priv This patch merges struct wb35_adapter to struct wbsoft_priv. Now we can finally start passing a pointer to struct ieee80211_hw around where necessary. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/wb35tx_f.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/winbond/wb35tx_f.h') diff --git a/drivers/staging/winbond/wb35tx_f.h b/drivers/staging/winbond/wb35tx_f.h index 466eb6f26c60..277faa7aaed8 100644 --- a/drivers/staging/winbond/wb35tx_f.h +++ b/drivers/staging/winbond/wb35tx_f.h @@ -1,7 +1,7 @@ #ifndef __WINBOND_WB35TX_F_H #define __WINBOND_WB35TX_F_H -#include "adapter.h" +#include "core.h" #include "wbhal_f.h" //==================================== @@ -11,16 +11,16 @@ unsigned char Wb35Tx_initial( phw_data_t pHwData ); void Wb35Tx_destroy( phw_data_t pHwData ); unsigned char Wb35Tx_get_tx_buffer( phw_data_t pHwData, u8 **pBuffer ); -void Wb35Tx_EP2VM(struct wb35_adapter *adapter); -void Wb35Tx_EP2VM_start(struct wb35_adapter *adapter); +void Wb35Tx_EP2VM(struct wbsoft_priv *adapter); +void Wb35Tx_EP2VM_start(struct wbsoft_priv *adapter); void Wb35Tx_EP2VM_complete(struct urb *urb); -void Wb35Tx_start(struct wb35_adapter *adapter); +void Wb35Tx_start(struct wbsoft_priv *adapter); void Wb35Tx_stop( phw_data_t pHwData ); -void Wb35Tx(struct wb35_adapter *adapter); +void Wb35Tx(struct wbsoft_priv *adapter); void Wb35Tx_complete(struct urb *urb); void Wb35Tx_reset_descriptor( phw_data_t pHwData ); -void Wb35Tx_CurrentTime(struct wb35_adapter *adapter, u32 TimeCount); +void Wb35Tx_CurrentTime(struct wbsoft_priv *adapter, u32 TimeCount); #endif -- cgit v1.2.3