linux-next: build failure after merge of the final tree (net-next tree related)

Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function)
drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function)
drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function)

Caused by commit 2800209994f8 ("e1000e: Refactor PM flows") from the
net-next tree.

I reverted that commit for today (and 63eb48f151b5 "e1000e Refactor of
Runtime Power Management" that conflicts with the revert).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au