diff --git a/[refs] b/[refs] index 92aac593b7fc..a17047538e39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6e3d4f4c2fd00a58561db35d6fc6e060ebbebff +refs/heads/master: 8304cc64dc242f4b410899256c929b9a93108a92 diff --git a/trunk/drivers/staging/rtl8192e/rtllib.h b/trunk/drivers/staging/rtl8192e/rtllib.h index 23c362545d07..8afe29589c4a 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib.h +++ b/trunk/drivers/staging/rtl8192e/rtllib.h @@ -1806,12 +1806,11 @@ enum rt_ps_mode { eAutoPs, }; -typedef enum _IPS_CALLBACK_FUNCION -{ +enum ips_callback_function { IPS_CALLBACK_NONE = 0, IPS_CALLBACK_MGNT_LINK_REQUEST = 1, IPS_CALLBACK_JOIN_REQUEST = 2, -} IPS_CALLBACK_FUNCION; +}; typedef enum _RT_JOIN_ACTION{ RT_JOIN_INFRA = 1, @@ -1864,7 +1863,7 @@ struct rt_pwr_save_ctrl { struct work_struct InactivePsWorkItem; struct timer_list InactivePsTimer; - IPS_CALLBACK_FUNCION ReturnPoint; + enum ips_callback_function ReturnPoint; bool bTmpBssDesc; RT_JOIN_ACTION tmpJoinAction;