git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-1000.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-1000.c
b/drivers/net/wireless/iwlwifi/iwl-1000.c
index
e12b48c
..
dd008b0
100644
(file)
--- 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,