From: Pavel Roskin Date: Sun, 6 Jul 2008 13:12:30 +0000 (-0400) Subject: hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM X-Git-Tag: v2.6.27-rc1~969^2~186^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0ac2a00c1035c749b720c4d817beea1795f02d47;p=linux-2.6-omap-h63xx.git hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 6c158a56948..09004a632ae 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -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