next-20140313 - build error in e1000e driver

[Valdis Kletnieks]

My kernel has CONFIG_PM_SLEEP=n, which leads to hilarity...

  CC      drivers/net/ethernet/intel/e1000e/netdev.o
drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function)
  .suspend = e1000e_pm_suspend,
             ^
drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function)
  .resume  = e1000e_pm_resume,
             ^
make[5]: *** [drivers/net/ethernet/intel/e1000e/netdev.o] Error 1
make[4]: *** [drivers/net/ethernet/intel/e1000e] Error 2
make[3]: *** [drivers/net/ethernet/intel] Error 2
make[2]: *** [drivers/net/ethernet] Error 2
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2

Commit 38a529b5d4 claims to fix a related issue, but doesn't seem to do so correctly.

Author: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Date:   Thu Jan 16 14:39:39 2014 +0200

    e1000e: Fix compilation warning when !CONFIG_PM_SLEEP
    
    Commit 7509963c703b (e1000e: Fix a compile flag mis-match for
    suspend/resume) moved suspend and resume hooks to be available when
    CONFIG_PM is set. However, it can be set even if CONFIG_PM_SLEEP is not set
    causing following warnings to be emitted:
    
    drivers/net/ethernet/intel/e1000e/netdev.c:6178:12: warning:
        â??e1000_suspendâ?? defined but not used [-Wunused-function]
    
    drivers/net/ethernet/intel/e1000e/netdev.c:6185:12: warning:
        â??e1000_resumeâ?? defined but not used [-Wunused-function]

Attachment: pgprAq5bklgB4.pgp
Description: PGP signature