From: Andrew Morton CONFIG_PM=n: drivers/net/atl1/atl1_main.c:2357: warning: 'atl1_suspend' defined but not used drivers/net/atl1/atl1_main.c:2426: warning: 'atl1_resume' defined but not used Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/atl1/atl1_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff -puN drivers/net/atl1/atl1_main.c~git-netdev-all-atl1-pm-fix drivers/net/atl1/atl1_main.c --- a/drivers/net/atl1/atl1_main.c~git-netdev-all-atl1-pm-fix +++ a/drivers/net/atl1/atl1_main.c @@ -2353,6 +2353,7 @@ static void __devexit atl1_remove(struct pci_disable_device(pdev); } +#ifdef CONFIG_PM static int atl1_suspend(struct pci_dev *pdev, pm_message_t state) { struct net_device *netdev = pci_get_drvdata(pdev); @@ -2446,6 +2447,10 @@ static int atl1_resume(struct pci_dev *p return 0; } +#else +#define atl1_suspend NULL +#define atl1_resume NULL +#endif static struct pci_driver atl1_driver = { .name = atl1_driver_name, @@ -2454,10 +2459,8 @@ static struct pci_driver atl1_driver = { .remove = __devexit_p(atl1_remove), /* Power Managment Hooks */ /* probably broken right now -- CHS */ -#ifdef CONFIG_PM .suspend = atl1_suspend, .resume = atl1_resume -#endif }; /** _