projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70197ed
)
hostap: don't compile prism2_suspend() for hostap_pci without CONFIG_PM
author
Pavel Roskin
<
[email protected]
>
Sun, 6 Jul 2008 13:12:30 +0000
(09:12 -0400)
committer
John W. Linville
<
[email protected]
>
Tue, 8 Jul 2008 18:16:05 +0000
(14:16 -0400)
Signed-off-by: Pavel Roskin <
[email protected]
>
Signed-off-by: John W. Linville <
[email protected]
>
drivers/net/wireless/hostap/hostap_hw.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/hostap/hostap_hw.c
b/drivers/net/wireless/hostap/hostap_hw.c
index 6c158a5694854f2cd57e4c1c089575eafd8785d0..09004a632ae719fc43d20a540a527c676089e8db 100644
(file)
--- 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)
}
-#if
ndef 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