diff options
author | Michel Lespinasse <walken@google.com> | 2011-03-06 11:14:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-14 17:22:01 -0400 |
commit | 942527634e201883b39fe0c97a1e47db7a026f91 (patch) | |
tree | d867641098f29a060d8025deffdf3bec269a1d54 /drivers/net/sky2.c | |
parent | b3017e6a03d261778ad9450b5510460c4d462203 (diff) |
drivers/net: fix build warnings with CONFIG_PM_SLEEP disabled
This fixes a couple of build warnings when CONFIG_PM is enabled but
CONFIG_PM_SLEEP is disabled. Applies on top of v2.6.38-rc7 - I know it's
late, but it would be great if v2.6.38 could compile without warnings!
Signed-off-by: Michel Lespinasse <walken@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 7d85a38377a1..2a91868788f7 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -4983,7 +4983,7 @@ static int sky2_suspend(struct device *dev) | |||
4983 | return 0; | 4983 | return 0; |
4984 | } | 4984 | } |
4985 | 4985 | ||
4986 | #ifdef CONFIG_PM | 4986 | #ifdef CONFIG_PM_SLEEP |
4987 | static int sky2_resume(struct device *dev) | 4987 | static int sky2_resume(struct device *dev) |
4988 | { | 4988 | { |
4989 | struct pci_dev *pdev = to_pci_dev(dev); | 4989 | struct pci_dev *pdev = to_pci_dev(dev); |