From: Martin J. Bligh <mbligh@mbligh.org>
Date: Fri, 28 Oct 2005 22:14:44 +0000 (-0700)
Subject: [PATCH] e1000: remove warning about e1000_suspend
X-Git-Tag: v2.6.15-rc1~731^2~3^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a1d5f88473138497d8694ddf174e8e91300068;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed