diff options
author | Daniel Halperin <dhalperi@cs.washington.edu> | 2012-01-03 13:53:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-03 13:53:16 -0500 |
commit | faa85aa24286a9e14ae7cc797352350c3ac39986 (patch) | |
tree | 7471ec6f96f741501e2b5284dc26756b900fdd8d /drivers/net/ethernet/marvell | |
parent | 86d8c07ff2448eb4e860e50f34ef6ee78e45c40c (diff) |
skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP
drivers/net/ethernet/marvell/skge.c:4046: warning: ‘skge_suspend’ defined but not used
drivers/net/ethernet/marvell/skge.c:4071: warning: ‘skge_resume’ defined but not used
Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r-- | drivers/net/ethernet/marvell/skge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index b3f63681308..18a87a57fc0 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c | |||
@@ -4042,7 +4042,7 @@ static void __devexit skge_remove(struct pci_dev *pdev) | |||
4042 | pci_set_drvdata(pdev, NULL); | 4042 | pci_set_drvdata(pdev, NULL); |
4043 | } | 4043 | } |
4044 | 4044 | ||
4045 | #ifdef CONFIG_PM | 4045 | #ifdef CONFIG_PM_SLEEP |
4046 | static int skge_suspend(struct device *dev) | 4046 | static int skge_suspend(struct device *dev) |
4047 | { | 4047 | { |
4048 | struct pci_dev *pdev = to_pci_dev(dev); | 4048 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -4104,7 +4104,7 @@ static SIMPLE_DEV_PM_OPS(skge_pm_ops, skge_suspend, skge_resume); | |||
4104 | #else | 4104 | #else |
4105 | 4105 | ||
4106 | #define SKGE_PM_OPS NULL | 4106 | #define SKGE_PM_OPS NULL |
4107 | #endif | 4107 | #endif /* CONFIG_PM_SLEEP */ |
4108 | 4108 | ||
4109 | static void skge_shutdown(struct pci_dev *pdev) | 4109 | static void skge_shutdown(struct pci_dev *pdev) |
4110 | { | 4110 | { |