diff --git a/[refs] b/[refs] index 823a77e21965..6c6befcaf012 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 800119e7fa1fd3f9df3396e99aa5d4bba8e24f03 +refs/heads/master: e75c3c4a8c53f3ee72e5a696f9792a341744128d diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c index 517eab38b96b..1717ca31dd0a 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_phy.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_phy.c @@ -827,7 +827,7 @@ u8 rtl8192_phy_SetSwChnlCmdArray( struct sw_chnl_cmd* CmdTable, u32 CmdTableIdx, u32 CmdTableSz, - SwChnlCmdID CmdID, + enum sw_chnl_cmd_id CmdID, u32 Para1, u32 Para2, u32 msDelay diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.h b/trunk/drivers/staging/rtl8192e/r8192E_phy.h index 29bf6c683a21..e214ee7b1408 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_phy.h +++ b/trunk/drivers/staging/rtl8192e/r8192E_phy.h @@ -47,7 +47,7 @@ -typedef enum _SwChnlCmdID { +enum sw_chnl_cmd_id { CmdID_End, CmdID_SetTxPowerLevel, CmdID_BBRegWrite10, @@ -55,11 +55,11 @@ typedef enum _SwChnlCmdID { CmdID_WritePortUshort, CmdID_WritePortUchar, CmdID_RF_WriteReg, -} SwChnlCmdID; +}; /*--------------------------------Define structure--------------------------------*/ struct sw_chnl_cmd { - SwChnlCmdID CmdID; + enum sw_chnl_cmd_id CmdID; u32 Para1; u32 Para2; u32 msDelay;