diff options
| author |   Tony Lindgren <tony@atomide.com> | 2016-11-14 15:58:18 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-11-14 15:58:18 -0800 |
| commit | 2bb6375f5c03cc5bf510402b646c1a23046b3f12 (patch) | |
| tree | 452e5cb138a11d64fcc1b1c35d756dd46f7c15ad /arch/arm/mach-omap2/Makefile | |
| parent | ARM: DRA7: hwmod: Do not register RTC on DRA71 (diff) | |
| parent | ARM: OMAP5: Add basic cpuidle MPU CSWR support (diff) | |
| download | linux-dev-2bb6375f5c03cc5bf510402b646c1a23046b3f12.tar.xz linux-dev-2bb6375f5c03cc5bf510402b646c1a23046b3f12.zip | |
Merge branch 'omap-for-v4.10/cpuidle-v2' into omap-for-v4.10/soc
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 5b37ec29996e..e37ceb81a379 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -80,7 +80,7 @@ endif # Power Management omap-4-5-pm-common = omap-mpuss-lowpower.o obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common) -obj-$(CONFIG_ARCH_OMAP5) += $(omap-4-5-pm-common) +obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-pm-common) obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o ifeq ($(CONFIG_PM),y) |