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/mips/kernel/mikrotik-rb532 | 3 --- 1 file changed, 3 deletions(-) (limited to 'target/mips/kernel/mikrotik-rb532') diff --git a/target/mips/kernel/mikrotik-rb532 b/target/mips/kernel/mikrotik-rb532 index 57ef2e1ed..8162e7619 100644 --- a/target/mips/kernel/mikrotik-rb532 +++ b/target/mips/kernel/mikrotik-rb532 @@ -1,8 +1,5 @@ CONFIG_MIPS=y CONFIG_MIKROTIK_RB532=y CONFIG_CPU_MIPS32_R1=y -CONFIG_KORINA=y -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -- cgit v1.2.3