Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / orinoco / main.c

diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index e9b1db77a73595e11d9025f95e0206f1b7144b44..345593c4accbe3c2f007acd9836e66a9ff8375e0 100644 (file)
--- 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);