diff options
| author |   Andrey Borzenkov <arvidjaar@mail.ru> | 2009-02-28 23:09:09 +0300 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-03-16 18:09:26 -0400 |
| commit | 2bfc5cb57b55ed2204bca7668e082f7bf485760a (patch) | |
| tree | e3a9855ff25ed4d1b9d0895851412fdce7f1b994 /drivers/net/wireless/orinoco/orinoco.h | |
| parent | tcp: make sure xmit goal size never becomes zero (diff) | |
| download | linux-dev-2bfc5cb57b55ed2204bca7668e082f7bf485760a.tar.xz linux-dev-2bfc5cb57b55ed2204bca7668e082f7bf485760a.zip | |
orinoco: firmware: consistently compile out fw cache support if not requested
Currently part of support for FW caching is unconditionally compiled
in even if it is never used. Consistently remove caching support if
not requested by user.
Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco.h')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h index f3f94b28ce6d..8e5a72cc297f 100644 --- a/drivers/net/wireless/orinoco/orinoco.h +++ b/drivers/net/wireless/orinoco/orinoco.h @@ -159,9 +159,11 @@ struct orinoco_private { unsigned int tkip_cm_active:1; unsigned int key_mgmt:3; +#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP) /* Cached in memory firmware to use during ->resume. */ const struct firmware *cached_pri_fw; const struct firmware *cached_fw; +#endif struct notifier_block pm_notifier; }; |