iwlwifi: remove IWL{4965,3945}_QOS

[~andy/linux] / drivers / net / wireless / iwlwifi / iwl-3945.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 1beb5b67679725a814fbdd85550b23054efd1d55..393cff6f2270ca6e1ebb24e3f693d19d53113d90 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -431,8 +431,6 @@ union iwl3945_ht_rate_supp {
        };
 };
 
-#ifdef CONFIG_IWL3945_QOS
-
 union iwl3945_qos_capabity {
        struct {
                u8 edca_count:4;        /* bit 0-3 */
@@ -460,7 +458,6 @@ struct iwl3945_qos_info {
        union iwl3945_qos_capabity qos_cap;
        struct iwl3945_qosparam_cmd def_qos_parm;
 };
-#endif /*CONFIG_IWL3945_QOS */
 
 #define STA_PS_STATUS_WAKE             0
 #define STA_PS_STATUS_SLEEP            1
@@ -869,9 +866,7 @@ struct iwl3945_priv {
        u16 assoc_capability;
        u8 ps_mode;
 
-#ifdef CONFIG_IWL3945_QOS
        struct iwl3945_qos_info qos_data;
-#endif /*CONFIG_IWL3945_QOS */
 
        struct workqueue_struct *workqueue;