On Thu, 2014-12-04 at 02:15 +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wyso...@intel.com> > > After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is > selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks > depending on CONFIG_PM_RUNTIME within #ifdef blocks depending on > CONFIG_PM may be dropped now. > > Do that in the e1000e and igb network drivers. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Acked-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
> --- > > Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME > if > PM_SLEEP is selected) which is only in linux-next at the moment (via > the > linux-pm tree). > > Please let me know if it is OK to take this one into linux-pm. Yes, that is fine. > > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 2 -- > drivers/net/ethernet/intel/igb/igb_main.c | 6 +----- > 2 files changed, 1 insertion(+), 7 deletions(-)
signature.asc
Description: This is a digitally signed message part