]> err.no Git - linux-2.6/commit
[PATCH] e1000: remove warning about e1000_suspend
authorMartin J. Bligh <mbligh@mbligh.org>
Fri, 28 Oct 2005 22:14:44 +0000 (15:14 -0700)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 23:06:42 +0000 (19:06 -0400)
commitb6a1d5f88473138497d8694ddf174e8e91300068
tree30d0b9771aae18d62c927cd257643a034f02bacb
parent596c96ba06e5d56e72451e02f93f4e15e17458df
[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>
drivers/net/e1000/e1000_main.c