summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/orinoco/main.c
diff options
context:
space:
mode:
authorAndrey Borzenkov <arvidjaar@mail.ru>2009-02-28 23:09:09 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-03-16 18:09:26 -0400
commit2bfc5cb57b55ed2204bca7668e082f7bf485760a (patch)
treee3a9855ff25ed4d1b9d0895851412fdce7f1b994 /drivers/net/wireless/orinoco/main.c
parentafece1c6587010cc81d1a43045c855774e8234a3 (diff)
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/main.c')
-rw-r--r--drivers/net/wireless/orinoco/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index e9b1db77a735..345593c4accb 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -2580,8 +2580,10 @@ struct net_device
netif_carrier_off(dev);
priv->last_linkstatus = 0xffff;
+#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP)
priv->cached_pri_fw = NULL;
priv->cached_fw = NULL;
+#endif
/* Register PM notifiers */
orinoco_register_pm_notifier(priv);