diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/ppc64/kernel | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/ppc64/kernel')
| -rw-r--r-- | target/ppc64/kernel/qemu-ppc64 | 8 |
1 files changed, 0 insertions, 8 deletions
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 |