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/arm/kernel/qemu-arm-vexpress-a9 | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/kernel/qemu-arm-vexpress-a9')
| -rw-r--r-- | target/arm/kernel/qemu-arm-vexpress-a9 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b89b87337..9c2194631 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,9 +13,5 @@ CONFIG_ATAGS=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -CONFIG_OF=y -CONFIG_DTC=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_SMSC911X=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |