summaryrefslogtreecommitdiff
path: root/target/mips/kernel/mikrotik-rb532
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
commit05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch)
treee99502f671b83f6898a77b78f88fdc67be8aa251 /target/mips/kernel/mikrotik-rb532
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/mips/kernel/mikrotik-rb532')
-rw-r--r--target/mips/kernel/mikrotik-rb5323
1 files changed, 0 insertions, 3 deletions
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