summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-11-07 16:50:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-15 13:42:57 +0100
commitb336dc57bc927e0fb3e7d2591d70b9ec7e426e18 (patch)
tree613d9004b01161b747bd6234d377720e9851f784 /arch/arm
parent0f665deba9bc67a2af52e2e956a13e59ba1600f8 (diff)
downloadlinux-rpi3-b336dc57bc927e0fb3e7d2591d70b9ec7e426e18.tar.gz
linux-rpi3-b336dc57bc927e0fb3e7d2591d70b9ec7e426e18.tar.bz2
linux-rpi3-b336dc57bc927e0fb3e7d2591d70b9ec7e426e18.zip
ARM: OMAP5: Fix build for PM code
commit da6d5993bf951846956903bee4f0eafd918250db upstream. It's CONFIG_SOC_OMAP5, not CONFIG_ARCH_OMAP5. Looks like make randconfig builds have not hit this one yet. Fixes: b3bf289c1c45 ("ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set") Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/Makefile2
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)