From: Andrew Morton Signed-off-by: Andrew Morton --- arch/mips/Kconfig | 4 ---- arch/mips/cobalt/setup.c | 4 ---- 2 files changed, 8 deletions(-) diff -puN arch/mips/Kconfig~git-mips-fixup arch/mips/Kconfig --- a/arch/mips/Kconfig~git-mips-fixup +++ a/arch/mips/Kconfig @@ -617,12 +617,8 @@ config TOSHIBA_JMR3927 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN -<<<<<<< HEAD/arch/mips/Kconfig - select GENERIC_HARDIRQS_NO__DO_IRQ -======= select TOSHIBA_BOARDS select GENERIC_HARDIRQS_NO__DO_IRQ ->>>>>>> /arch/mips/Kconfig config TOSHIBA_RBTX4927 bool "Toshiba TBTX49[23]7 board" diff -puN arch/mips/cobalt/setup.c~git-mips-fixup arch/mips/cobalt/setup.c --- a/arch/mips/cobalt/setup.c~git-mips-fixup +++ a/arch/mips/cobalt/setup.c @@ -103,9 +103,6 @@ void __init plat_mem_setup(void) /* These resources have been reserved by VIA SuperI/O chip. */ for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++) request_resource(&ioport_resource, cobalt_reserved_resources + i); -<<<<<<< HEAD/arch/mips/cobalt/setup.c -======= - /* Read the cobalt id register out of the PCI config space */ PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3)); cobalt_board_id = GT_READ(GT_PCI0_CFGDATA_OFS); @@ -128,7 +125,6 @@ void __init plat_mem_setup(void) early_serial_setup(&uart); #endif } ->>>>>>> /arch/mips/cobalt/setup.c } /* _