diff --git a/[refs] b/[refs] index 82cd5daefac5..5d2e3b61d155 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 586c7ecc78949f03c9f31735f4935abef38f8f2b +refs/heads/master: d1888db58869fdda7872359358e8584fbccd9bad diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h index 6ebb3f75dad1..ae5cf541577a 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h @@ -144,6 +144,7 @@ void iwl_calib_free_results(struct iwl_priv *priv); void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand); int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, char **buf, bool display); +int iwlagn_hw_valid_rtc_data_addr(u32 addr); /* lib */ int iwlagn_send_tx_power(struct iwl_priv *priv); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index 68f452dc2272..4b764d7967ca 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -190,7 +190,6 @@ enum iwl_rxon_context_id { NUM_IWL_RXON_CTX }; -int iwlagn_hw_valid_rtc_data_addr(u32 addr); const char *get_cmd_string(u8 cmd); #define IWL_CMD(x) case x: return #x