diff options
author | Tony Lindgren <tony@atomide.com> | 2013-11-15 08:27:29 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-11-15 08:27:29 -0800 |
commit | 26273e02a0cf18eb72416559310d3294390a9024 (patch) | |
tree | c6f8678a594076ba2ad8a1c3aa29d690c29c0ec7 /arch/arm/mach-omap2/Makefile | |
parent | 3522bf7bfa248b99eafa2f4872190699a808c7d9 (diff) | |
download | lwn-26273e02a0cf18eb72416559310d3294390a9024.tar.gz lwn-26273e02a0cf18eb72416559310d3294390a9024.zip |
ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
Otherwise we can get errors like:
arch/arm/mach-omap2/prm44xx.c:274: error: redefinition of ‘omap44xx_prm_reconfigure_io_chain’
arch/arm/mach-omap2/built-in.o: In function `default_finish_suspend':
arch/arm/mach-omap2/omap-mpuss-lowpower.c:95: undefined reference to `omap_do_wfi'
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 e15ac005ef17..1f25f3e99c05 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -40,7 +40,7 @@ omap-4-5-common = omap4-common.o omap-wakeupgen.o obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y) sleep44xx.o obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) sleep44xx.o obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common) -obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-common) $(smp-y) +obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-common) $(smp-y) sleep44xx.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) |