From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/mips/kernel/qemu-mipsel | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 target/mips/kernel/qemu-mipsel (limited to 'target/mips/kernel/qemu-mipsel') diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel deleted file mode 100644 index 422170fbb..000000000 --- a/target/mips/kernel/qemu-mipsel +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_MIPS=y -CONFIG_MIPS_MALTA=y -CONFIG_MIPS_BONITO64=y -CONFIG_MIPS_MSC=y -CONFIG_CPU_MIPS32_R1=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -- cgit v1.2.3