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/sparc64/kernel/qemu-sparc64 | 3 --- 1 file changed, 3 deletions(-) (limited to 'target/sparc64') diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index e3cd03068..53191c99f 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -1,8 +1,5 @@ CONFIG_SPARC=y CONFIG_SPARC64=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCI_DOMAINS=y CONFIG_SUN_OPENPROMFS=y CONFIG_SPARC64_PCI=y CONFIG_OF=y -- cgit v1.2.3