From: Simon Horman <horms+renesas@verge.net.au>
Date: Mon, 16 Mar 2015 23:06:21 +0000 (+0900)
Subject: Merge branch 'heads/pm-for-v4.1' into next
X-Git-Tag: KARO-TXA5-2015-06-26~142^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=527e79e25f1f7245dd5aea23c94525bd45ae4bf4;p=karo-tx-linux.git

Merge branch 'heads/pm-for-v4.1' into next
---

527e79e25f1f7245dd5aea23c94525bd45ae4bf4
diff --cc arch/arm/mach-shmobile/Makefile
index 9e9d6788de51,0ae702b0d45b..56554e0dd3ba
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -49,7 -50,11 +49,8 @@@ obj-$(CONFIG_CPU_IDLE)		+= cpuidle.
  obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
  obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o
  obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o
+ obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o
  
 -# special sh7372 handling for IRQ objects and low level sleep code
 -obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o sleep-sh7372.o
 -
  # Board objects
  ifdef CONFIG_ARCH_SHMOBILE_MULTI
  obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o