From: Hiroaki SHIMODA Date: Tue, 15 Apr 2014 08:20:19 +0000 (+0000) Subject: e1000e: Enclose e1000e_pm_thaw() with CONFIG_PM_SLEEP X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e7986f67c0e444b2419f25c48815e17ebbab836;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git e1000e: Enclose e1000e_pm_thaw() with CONFIG_PM_SLEEP Fix following compilation warning: drivers/net/ethernet/intel/e1000e/netdev.c:6238:12: warning ‘e1000e_pm_thaw’ defined but not used [-Wunused-function] static int e1000e_pm_thaw(struct device *dev) ^ Signed-off-by: Hiroaki SHIMODA Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 165f7bcd66ae..8926a13ae323 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6235,6 +6235,7 @@ static int __e1000_resume(struct pci_dev *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP static int e1000e_pm_thaw(struct device *dev) { struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); @@ -6255,7 +6256,6 @@ static int e1000e_pm_thaw(struct device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP static int e1000e_pm_suspend(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev);