From: Auke Kok Date: Wed, 27 Sep 2006 19:53:19 +0000 (-0700) Subject: e1000: keep .suspend and .resume driver methods in CONFIG_PM X-Git-Tag: upstream/snapshot3+hdmi~37434^2~5^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4e24f01f18f6cea422552caec2fdbf5765a7c7c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git e1000: keep .suspend and .resume driver methods in CONFIG_PM Signed-off-by: Auke Kok --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index bd67380..0aaf9af 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -211,9 +211,9 @@ static struct pci_driver e1000_driver = { .id_table = e1000_pci_tbl, .probe = e1000_probe, .remove = __devexit_p(e1000_remove), +#ifdef CONFIG_PM /* Power Managment Hooks */ .suspend = e1000_suspend, -#ifdef CONFIG_PM .resume = e1000_resume, #endif .shutdown = e1000_shutdown,