fix confrict

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index ab78325..d7e1333 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -10,14 +10,7 @@ config H8300
        select ARCH_WANT_FRAME_POINTER
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
-<<<<<<< HEAD
        select GENERIC_CLOCKEVENTS
-=======
-       select OLD_SIGSUSPEND3
-       select OLD_SIGACTION
-       select HAVE_UNDERSCORE_SYMBOL_PREFIX
-       select FRAME_POINTER
->>>>>>> master
 
 config MMU
        bool

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index aaeae96..90f97c2 100644 (file)
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -24,17 +24,7 @@ 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)
 

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 4a37ec9..ecc9619 100644 (file)
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -34,11 +34,7 @@ SECTIONS
        }
        EXCEPTION_TABLE(16)
        NOTES
-<<<<<<< HEAD
        RO_DATA(4)
-=======
-       RODATA
->>>>>>> master
 #if defined(CONFIG_ROMKERNEL)
        .init.text : {
                _sinittext = .;