diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 13:43:40 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 13:43:40 -0700 |
| commit | 8715fa28fb4fad62f6004d276ec8e1aa5e664e76 (patch) | |
| tree | 5e07f18c04f497833c6b5f043360f5ef58f1f028 /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) | |
| parent | f2fa1b015e9c199e45c836c769d94db595150731 (diff) | |
| download | kernel_samsung_smdk4412-8715fa28fb4fad62f6004d276ec8e1aa5e664e76.zip kernel_samsung_smdk4412-8715fa28fb4fad62f6004d276ec8e1aa5e664e76.tar.gz kernel_samsung_smdk4412-8715fa28fb4fad62f6004d276ec8e1aa5e664e76.tar.bz2 | |
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index f09bff8..73f5fc6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -2801,7 +2801,6 @@ static void iwl_force_rf_reset(struct iwl_priv *priv) */ IWL_DEBUG_INFO(priv, "perform radio reset.\n"); iwl_internal_short_hw_scan(priv); - return; } |