drivers/cpu/Kconfig: cleanup

diff --git a/drivers/cpu/Kconfig b/drivers/cpu/Kconfig
index fa83d71354865cec3457f924405e720a3e215876..eda76c8907b309144a15b8ca43a21394a115af89 100644 (file)
--- a/drivers/cpu/Kconfig
+++ b/drivers/cpu/Kconfig
@@ -20,13 +20,12 @@ config CPU_RISCV
        help
          Support CPU cores for RISC-V architecture.
 
-<<<<<<< HEAD
 config CPU_BAIKAL
        bool "Enable Baikal-T1 CPU driver"
        depends on CPU
        help
          Support CPU cores for Baikal mips chips.
-=======
+
 config CPU_MICROBLAZE
        bool "Enable Microblaze CPU driver"
        depends on CPU && MICROBLAZE
@@ -34,4 +33,3 @@ config CPU_MICROBLAZE
        select XILINX_MICROBLAZE0_PVR
        help
          Support CPU cores for Microblaze architecture.
->>>>>>> upstream_testing