Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_ht.h

diff --git a/drivers/staging/rtl8712/rtl871x_ht.h b/drivers/staging/rtl8712/rtl871x_ht.h
index 41872d9374081f38e8f62015dabada0c30528e3b..513f458ea07caf5b6c2c9d65db289d65675d4836 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ht.h
+++ b/drivers/staging/rtl8712/rtl871x_ht.h
@@ -36,7 +36,8 @@ struct ht_priv {
        unsigned int    tx_amsdu_enable;/*for enable Tx A-MSDU */
        unsigned int    tx_amdsu_maxlen; /* 1: 8k, 0:4k ; default:8k, for tx */
        unsigned int    rx_ampdu_maxlen; /* for rx reordering ctrl win_sz,
-                                         *  updated when join_callback. */
+                                         * updated when join_callback.
+                                         */
        struct ieee80211_ht_cap ht_cap;
 };