From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/mips/kernel/qemu-mips | 5 ----- 1 file changed, 5 deletions(-) (limited to 'target/mips/kernel/qemu-mips') diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index d3129fbda..ca7b79eb9 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,11 +3,6 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CPU_MIPS32_R1=y -CONFIG_PAGE_SIZE_4KB=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -- cgit v1.2.3