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:
4d900f9
)
netxen: fix build with without CONFIG_PM
author
Dhananjay Phadke
<
[email protected]
>
Mon, 22 Jun 2009 20:26:20 +0000
(20:26 +0000)
committer
David S. Miller
<
[email protected]
>
Tue, 23 Jun 2009 11:16:42 +0000
(
04:16
-0700)
wrap pci suspend() and resume() with CONFIG_PM check.
Signed-off-by: Dhananjay Phadke <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/netxen/netxen_nic_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/netxen/netxen_nic_main.c
b/drivers/net/netxen/netxen_nic_main.c
index 71daa3d5f114174f7ec13015b49fa8d45cb9d2a6..43ac333898bfb3f8240d20425c01ff02f28c1ce9 100644
(file)
--- a/
drivers/net/netxen/netxen_nic_main.c
+++ b/
drivers/net/netxen/netxen_nic_main.c
@@
-1178,6
+1178,7
@@
static void __devexit netxen_nic_remove(struct pci_dev *pdev)
free_netdev(netdev);
}
+#ifdef CONFIG_PM
static int
netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
{
@@
-1242,6
+1243,7
@@
netxen_nic_resume(struct pci_dev *pdev)
return 0;
}
+#endif
static int netxen_nic_open(struct net_device *netdev)
{
@@
-1771,8
+1773,10
@@
static struct pci_driver netxen_driver = {
.id_table = netxen_pci_tbl,
.probe = netxen_nic_probe,
.remove = __devexit_p(netxen_nic_remove),
+#ifdef CONFIG_PM
.suspend = netxen_nic_suspend,
.resume = netxen_nic_resume
+#endif
};
/* Driver Registration on NetXen card */