diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-23 09:18:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-23 09:18:27 -0700 |
| commit | 188933ac139a6f8ab06cad369bd0200af947b00d (patch) | |
| tree | c4c107528fcf6b82e32a93b0596e13eea7aa9385 /drivers/staging/rtl8712/rtl8712_cmd.h | |
| parent | Input: sun4i-ts - allow controlling filter and sensitivity via DT (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-dev-188933ac139a6f8ab06cad369bd0200af947b00d.tar.xz linux-dev-188933ac139a6f8ab06cad369bd0200af947b00d.zip | |
Merge tag 'v4.0-rc5' into next
Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.
Conflicts:
drivers/input/mouse/synaptics.c
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_cmd.h')
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h index 039ab3e97172..67e9e910aef9 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.h +++ b/drivers/staging/rtl8712/rtl8712_cmd.h @@ -109,16 +109,16 @@ enum rtl8712_h2c_cmd { GEN_CMD_CODE(_DisconnectCtrlEx), /*61*/ /* To do, modify these h2c cmd, add or delete */ - GEN_CMD_CODE(_GetH2cLbk) , + GEN_CMD_CODE(_GetH2cLbk), /* WPS extra IE */ - GEN_CMD_CODE(_SetProbeReqExtraIE) , - GEN_CMD_CODE(_SetAssocReqExtraIE) , - GEN_CMD_CODE(_SetProbeRspExtraIE) , - GEN_CMD_CODE(_SetAssocRspExtraIE) , + GEN_CMD_CODE(_SetProbeReqExtraIE), + GEN_CMD_CODE(_SetAssocReqExtraIE), + GEN_CMD_CODE(_SetProbeRspExtraIE), + GEN_CMD_CODE(_SetAssocRspExtraIE), /* the following is driver will do */ - GEN_CMD_CODE(_GetCurDataRate) , + GEN_CMD_CODE(_GetCurDataRate), GEN_CMD_CODE(_GetTxRetrycnt), /* to record times that Tx retry to * transmit packet after association |