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

Commit 5d6a5468 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull CONFIG_PM_RUNTIME elimination from Rafael Wysocki:
 "This removes the last few uses of CONFIG_PM_RUNTIME introduced
  recently and makes that config option finally go away.

  CONFIG_PM will be available directly from the menu now and also it
  will be selected automatically if CONFIG_SUSPEND or CONFIG_HIBERNATION
  is set"

* tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: Eliminate CONFIG_PM_RUNTIME
  tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
parents 787140ad 464ed18e

arch/arm/configs/ape6evm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=y

CONFIG_PM_RUNTIME=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/armadillo800eva_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CONFIG_KEXEC=y 
CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/bcm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ CONFIG_CPU_IDLE=y 
CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=y

arch/arm/configs/bockw_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/davinci_all_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m 
CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_IDLE=y

CONFIG_PM_RUNTIME=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y