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/x86/kernel/qemu-x86 | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'target/x86/kernel/qemu-x86')
-rw-r--r-- | target/x86/kernel/qemu-x86 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 index 7eb708745..849852a65 100644 --- a/target/x86/kernel/qemu-x86 +++ b/target/x86/kernel/qemu-x86 @@ -1,11 +1,4 @@ CONFIG_X86=y CONFIG_X86_32=y -CONFIG_PCI=y -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y |