| commit | a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3 | [log] [tgz] |
|---|---|---|
| author | Reinette Chatre <reinette.chatre@intel.com> | Mon May 10 15:08:11 2010 -0700 |
| committer | Reinette Chatre <reinette.chatre@intel.com> | Mon May 10 15:08:11 2010 -0700 |
| tree | b1774dad1d72b70d88ab6c51ff4b87697dfca57a | |
| parent | 9459d59fbf0bc82ff4c804679fa8bc22788eca63 [diff] [blame] | |
| parent | 562db532760827f6ce30801a08e6b568848bc9f2 [diff] [blame] |
Merge branch 'wireless-2.6' into wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-dev.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 58c69a5..cd3b932 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1242,6 +1242,8 @@ struct iwl_rx_phy_res last_phy_res; bool last_phy_res_valid; + + struct completion firmware_loading_complete; } _agn; #endif };