On Saturday 06 December 2014 08:20 AM, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > > 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 may now be changed to depend on > CONFIG_PM. > > Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere in the code under > arch/arm/ (the defconfig files will be modified later). > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > --- > > 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. > > --- > arch/arm/kernel/perf_event.c | 2 +- > arch/arm/mach-davinci/pm_domain.c | 2 +- Acked-by: Sekhar Nori <nsekhar@xxxxxx> for the mach-davinci change. I have nothing conflicting queued, so feel free to take this through your tree. Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html