From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/aarch64/kernel/arm-fm | 2 -- 1 file changed, 2 deletions(-) (limited to 'target/aarch64') diff --git a/target/aarch64/kernel/arm-fm b/target/aarch64/kernel/arm-fm index db8edb12d..291b4093e 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 -- cgit v1.2.3