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/sparc/kernel/qemu-sparc | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/sparc/kernel/qemu-sparc')
| -rw-r--r-- | target/sparc/kernel/qemu-sparc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index f58df04b4..ffa9bb9f8 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -2,12 +2,7 @@ CONFIG_SPARC=y CONFIG_SPARC32=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y -CONFIG_PCI=y -CONFIG_PCI_SYSCALL=y CONFIG_PCIC_PCI=y -CONFIG_OF=y -CONFIG_NET_VENDOR_AMD=y -CONFIG_SUNLANCE=y CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y |