build: fix a invalid merge

Change-Id: I505dd07f471c3f2f6a974f1e06df90997cb5a62e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/Makefile.target b/Makefile.target
index a0035d27503604c17fda3d9605dac7c5a6755fd6..15ea40b28708a97c11f9ef3be0ff55eb57611ba1 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -156,12 +156,6 @@ obj-y-save := $(obj-y)
 block-obj-y :=
 common-obj-y :=
 
-# Makefile for TIZEN-maru
-ifdef CONFIG_MARU
-include $(SRC_PATH)/tizen/src/Makefile.tizen
-endif
-##
-
 include $(SRC_PATH)/Makefile.objs
 dummy := $(call unnest-vars,.., \
                block-obj-y \
@@ -172,6 +166,12 @@ dummy := $(call unnest-vars,.., \
 # Now restore obj-y
 obj-y := $(obj-y-save)
 
+# Makefile for TIZEN-maru
+ifdef CONFIG_MARU
+include $(SRC_PATH)/tizen/src/Makefile.tizen
+endif
+##
+
 all-obj-y = $(obj-y) $(common-obj-y)
 all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)