From: Olof Johansson <olof@lixom.net>
Date: Fri, 3 Apr 2015 17:53:51 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: KARO-TXA5-2015-06-26~151^2~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0aaaa07056982c5e4f5a4d9a652b7c138a6ca4a6;p=karo-tx-linux.git

Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: OMAP2+: Remove legacy support for omap3 TouchBook
  ARM: OMAP3: Remove legacy support for devkit8000
  ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
  ARM: shmobile: Consolidate the pm code for R-Car Gen2
  ARM: shmobile: r8a7791: Correct SYSCIER value
  ARM: shmobile: r8a7790: Correct SYSCIER value
---

0aaaa07056982c5e4f5a4d9a652b7c138a6ca4a6
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