diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-05 13:23:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-05 13:23:14 -0500 |
| commit | 321f3b8708e853695a4ff4a1a95b6fa0965b06e5 (patch) | |
| tree | 0fd46721f5620710b079109b31a458573c1b3902 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | de398fb8b92eba3447298053a483727bdd5fe37e (diff) | |
| parent | cbec0627ef1adf7afa448e8bbae3146ce910212a (diff) | |
| download | linux-next-321f3b8708e853695a4ff4a1a95b6fa0965b06e5.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index e12b48c2cff6..dd008b0e6417 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -191,6 +191,7 @@ static struct iwl_base_params iwl1000_base_params = { .chain_noise_scale = 1000, .wd_timeout = IWL_DEF_WD_TIMEOUT, .max_event_log_size = 128, + .wd_disable = true, }; static struct iwl_ht_params iwl1000_ht_params = { .ht_greenfield_support = true, |