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/sparc/kernel/qemu-sparc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'target/sparc/kernel/qemu-sparc') diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index f58df04b4..ffa9bb9f8 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -2,12 +2,7 @@ CONFIG_SPARC=y CONFIG_SPARC32=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y CONFIG_PCIC_PCI=y -CONFIG_OF=y -CONFIG_NET_VENDOR_AMD=y -CONFIG_SUNLANCE=y CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y -- cgit v1.2.3