diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
| commit | fb65f180e02dde224af256b43d3ab2c28b9689d7 (patch) | |
| tree | 72b66091be51f3f16c2f9aae75be386a9fccc620 /drivers/net/wireless/iwlwifi/iwl-3945.h | |
| parent | ab59859de1946a098b091308380179e92dc7683b (diff) | |
| parent | 61c2b682b8391f13b67e2d95990a0aba34697d9c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index 45c1c5533bf..c7695a215a3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h @@ -742,7 +742,6 @@ struct iwl3945_priv { u8 direct_ssid_len; u8 direct_ssid[IW_ESSID_MAX_SIZE]; struct iwl3945_scan_cmd *scan; - u8 only_active_channel; /* spinlock */ spinlock_t lock; /* protect general shared data */ |