Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 035f10ee authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-runtime' 

* pm-runtime:
  power / PM: Eliminate CONFIG_PM_RUNTIME
  NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
  PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
  mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
  PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
  ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
parents 0a066642 f2ea5e17

arch/arm/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu) 
	armpmu->stop(armpmu);

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int armpmu_runtime_resume(struct device *dev)

{

	struct arm_pmu_platdata *plat = dev_get_platdata(dev);

arch/arm/mach-davinci/pm_domain.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/pm_clock.h>

#include <linux/platform_device.h>



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int davinci_pm_runtime_suspend(struct device *dev)

{

	int ret;

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS 
	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	select PM_GENERIC_DOMAINS if PM_RUNTIME

	select PM_GENERIC_DOMAINS if PM

	select S5P_DEV_MFC

	select SRAM

	select MFD_SYSCON

arch/arm/mach-keystone/pm_domain.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/clk-provider.h>

#include <linux/of.h>



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int keystone_pm_runtime_suspend(struct device *dev)

{

	int ret;

arch/arm/mach-omap1/pm_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "soc.h"



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int omap1_pm_runtime_suspend(struct device *dev)

{

	int ret;
@@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = { 
#define OMAP1_PM_DOMAIN (&default_pm_domain)

#else

#define OMAP1_PM_DOMAIN NULL

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static struct pm_clk_notifier_block platform_bus_notifier = {

	.pm_domain = OMAP1_PM_DOMAIN,