summaryrefslogtreecommitdiff
path: root/target/aarch64
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-13 11:44:08 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-13 11:44:08 (GMT)
commit05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch)
treee99502f671b83f6898a77b78f88fdc67be8aa251 /target/aarch64
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/aarch64')
-rw-r--r--target/aarch64/kernel/arm-fm2
1 files changed, 0 insertions, 2 deletions
diff --git a/target/aarch64/kernel/arm-fm b/target/aarch64/kernel/arm-fm
index db8edb1..291b409 100644
--- a/target/aarch64/kernel/arm-fm
+++ b/target/aarch64/kernel/arm-fm
@@ -1,7 +1,5 @@
CONFIG_ARM64=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_AEABI=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC91X=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y