]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM
authorPavel Roskin <proski@gnu.org>
Sun, 6 Jul 2008 13:12:30 +0000 (09:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 8 Jul 2008 18:16:05 +0000 (14:16 -0400)
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/hostap/hostap_hw.c

index 6c158a5694854f2cd57e4c1c089575eafd8785d0..09004a632ae719fc43d20a540a527c676089e8db 100644 (file)
@@ -3417,7 +3417,7 @@ static void prism2_free_local_data(struct net_device *dev)
 }
 
 
-#ifndef PRISM2_PLX
+#if (defined(PRISM2_PCI) && defined(CONFIG_PM)) || defined(PRISM2_PCCARD)
 static void prism2_suspend(struct net_device *dev)
 {
        struct hostap_interface *iface;
@@ -3436,7 +3436,7 @@ static void prism2_suspend(struct net_device *dev)
        /* Disable hardware and firmware */
        prism2_hw_shutdown(dev, 0);
 }
-#endif /* PRISM2_PLX */
+#endif /* (PRISM2_PCI && CONFIG_PM) || PRISM2_PCCARD */
 
 
 /* These might at some point be compiled separately and used as separate