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/sparc64 | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/sparc64')
| -rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 3 |
1 files changed, 0 insertions, 3 deletions
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 |