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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-6000.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-6000.c
b/drivers/net/wireless/iwlwifi/iwl-6000.c
index
bd438d8
..
7236382
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-6000.c
@@
-72,6
+72,7
@@
static struct iwl_ops iwl6000_ops = {
.lib = &iwl5000_lib,
.hcmd = &iwl5000_hcmd,
.utils = &iwl6000_hcmd_utils,
+ .smgmt = &iwl5000_station_mgmt,
};
struct iwl_cfg iwl6000_2ag_cfg = {