Merge branch 'master' into h8300

[uclinux-h8/linux.git] / arch / h8300 / Makefile

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index 90f97c2..aaeae96 100644 (file)
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -24,7 +24,17 @@ LDFLAGS += $(ldflags-y)
 CROSS_COMPILE := h8300-unknown-linux-
 LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
+<<<<<<< HEAD
 core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ arch/$(ARCH)/boards/
+=======
+head-y := arch/$(ARCH)/platform/$(PLATFORM)/$(BOARD)/crt0_$(MODEL).o
+
+core-y += arch/$(ARCH)/kernel/ \
+          arch/$(ARCH)/mm/
+ifdef PLATFORM
+core-y += arch/$(ARCH)/platform/$(PLATFORM)/ 
+endif
+>>>>>>> master
 
 libs-y += arch/$(ARCH)/lib/ $(LIBGCC)