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/ppc64/kernel/qemu-ppc64 | 8 -------- 1 file changed, 8 deletions(-) (limited to 'target/ppc64') diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64 index ebf952146..34f2e6fb7 100644 --- a/target/ppc64/kernel/qemu-ppc64 +++ b/target/ppc64/kernel/qemu-ppc64 @@ -21,14 +21,6 @@ CONFIG_IBMVIO=y CONFIG_EEH=y CONFIG_PPC_4K_PAGES=y CONFIG_PPC_PCI_CHOICE=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_SYSCALL=y -CONFIG_PCI_MSI=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_NET_VENDOR_IBM=y -CONFIG_IBMVETH=y CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_CONSOLE=y -- cgit v1.2.3