Commit b6a1d5f8 authored Oct 28, 2005 by Martin J. Bligh Committed by Jeff Garzik Oct 28, 2005

[PATCH] e1000: remove warning about e1000_suspend



e1000_suspend is only used under #ifdef CONFIG_PM.  Move the declaration of
it to be the same way, just like e1000_resume, otherwise gcc whines on
compile.  I offer as evidence:

	static struct pci_driver e1000_driver = {
 	       .name     = e1000_driver_name,
 	      .id_table = e1000_pci_tbl,
  	      .probe    = e1000_probe,
  	      .remove   = __devexit_p(e1000_remove),
 	      /* Power Managment Hooks */
	#ifdef CONFIG_PM
 	       .suspend  = e1000_suspend,
 	       .resume   = e1000_resume
	#endif
	};

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

parent 596c96ba

drivers/net/e1000/e1000_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4193,6 +4193,7 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
		return 0;
		}

		#ifdef CONFIG_PM
		static int
		e1000_suspend(struct pci_dev *pdev, pm_message_t state)
		{
		@@ -4289,7 +4290,6 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
		return 0;
		}

		#ifdef CONFIG_PM
		static int
		e1000_resume(struct pci_dev *pdev)
		{