From 83ac1e6abce8c5036ad0df0aa7e9fc5d168b1919 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Sat, 28 Jan 2012 08:10:35 +0000 Subject: [PATCH] --- yaml --- r: 290075 b: refs/heads/master c: d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 h: refs/heads/master i: 290073: 7257d811994707869b09f81907b5ec674aa6e971 290071: 4b685226e0dd80d2ad767aaaa58fe7906451179f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 84f3135fbf49..fec5d4785b18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f92518ddec7ce0ef2f7e91ae5f07e0a9e19055bf +refs/heads/master: d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c index e91d73c8aa4e..fd911cac1ac5 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c +++ b/trunk/drivers/net/ethernet/intel/igb/igb_main.c @@ -173,7 +173,9 @@ static int igb_check_vf_assignment(struct igb_adapter *adapter); #endif #ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int igb_suspend(struct device *); +#endif static int igb_resume(struct device *); #ifdef CONFIG_PM_RUNTIME static int igb_runtime_suspend(struct device *dev); @@ -6709,6 +6711,7 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, } #ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int igb_suspend(struct device *dev) { int retval; @@ -6728,6 +6731,7 @@ static int igb_suspend(struct device *dev) return 0; } +#endif /* CONFIG_PM_SLEEP */ static int igb_resume(struct device *dev) {