Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / arch / arm / common / Makefile

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index eaa9cf4705a7179dcb7221aa5f2a29a6c1883b78..4bdc41622c36686df868e2134d6453fe60684b5b 100644 (file)
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -16,3 +16,5 @@ obj-$(CONFIG_MCPM)            += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
 AFLAGS_mcpm_head.o             := -march=armv7-a
 AFLAGS_vlock.o                 := -march=armv7-a
 obj-$(CONFIG_TI_PRIV_EDMA)     += edma.o
+obj-$(CONFIG_BL_SWITCHER)      += bL_switcher.o
+obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o