diff options
| author | Gaku Inami <gaku.inami.xw@bp.renesas.com> | 2015-03-16 05:48:43 (GMT) |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-03-16 23:05:13 (GMT) |
| commit | a8caad66904a7923c05fc4a137110085533ef00c (patch) | |
| tree | 1ae9e73c55db36c2a62118eee8fe1069a8d1ceb5 /arch/arm/mach-shmobile/Makefile | |
| parent | 78420b5dca18f2034f18925f5608cda2c960c3f3 (diff) | |
| download | linux-a8caad66904a7923c05fc4a137110085533ef00c.tar.xz | |
ARM: shmobile: Consolidate the pm code for R-Car Gen2
The pm code for R-Car Gen2 is scatterd in each SoC. These files
(pm-r8a7790.c/pm-r8a7791.c) have some overlap code. This change
consolidate the pm code for R-Car Gen2 into one.
Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index d53996e..0ae702b 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -12,8 +12,8 @@ obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o -obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o pm-r8a7790.o -obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o pm-r8a7791.o +obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o +obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o @@ -50,6 +50,7 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle.o 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 |