diff --git a/[refs] b/[refs] index f9617fdfebd7..7f6b2fc3299d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a07dc3d145334fec51f1b773a47e84cd1d36c3ec +refs/heads/master: c13ac63b6096f87e5be41893a3a4e7a1848a20ae diff --git a/trunk/drivers/staging/rtl8192e/r8190P_def.h b/trunk/drivers/staging/rtl8192e/r8190P_def.h index 4bb71238964d..888da4b716a6 100644 --- a/trunk/drivers/staging/rtl8192e/r8190P_def.h +++ b/trunk/drivers/staging/rtl8192e/r8190P_def.h @@ -256,8 +256,7 @@ struct tx_fwinfo_8190pci { #define RX_DRIVER_INFO_SIZE 8 -typedef struct _LOG_INTERRUPT_8190 -{ +struct log_int_8190 { u32 nIMR_COMDOK; u32 nIMR_MGNTDOK; u32 nIMR_HIGH; @@ -270,7 +269,7 @@ typedef struct _LOG_INTERRUPT_8190 u32 nIMR_TBDOK; u32 nIMR_BDOK; u32 nIMR_RXFOVW; -} LOG_INTERRUPT_8190_T, *PLOG_INTERRUPT_8190_T; +}; typedef struct _phy_ofdm_rx_status_rxsc_sgien_exintfflag{ u8 reserved:4; diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c index 4e4ad7a4ad10..7861c362e9cf 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.c +++ b/trunk/drivers/staging/rtl8192e/rtl_core.c @@ -1226,7 +1226,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->force_reset = false; memset(priv->rtllib->swcamtable,0,sizeof(SW_CAM_TABLE)*32); - memset(&priv->InterruptLog,0,sizeof(LOG_INTERRUPT_8190_T)); + memset(&priv->InterruptLog,0,sizeof(struct log_int_8190)); priv->RxCounter = 0; priv->rtllib->wx_set_enc = 0; priv->bHwRadioOff = false; diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index 4fc78aa2368b..77b46bfaebb9 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -588,7 +588,7 @@ typedef struct r8192_priv work_struct_rsl reset_wq; - LOG_INTERRUPT_8190_T InterruptLog; + struct log_int_8190 InterruptLog; RT_CUSTOMER_ID CustomerID;