summaryrefslogtreecommitdiff
path: root/target/sh/kernel
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/sh/kernel
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/sh/kernel')
-rw-r--r--target/sh/kernel/qemu-sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh
index 1678d7a51..dbe8f023c 100644
--- a/target/sh/kernel/qemu-sh
+++ b/target/sh/kernel/qemu-sh
@@ -12,8 +12,6 @@ CONFIG_RTS7751R2D_PLUS=y
CONFIG_SH_TIMER_TMU=y
CONFIG_SH_INTC=y
CONFIG_CMDLINE_EXTEND=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139CP=y
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=2
CONFIG_SERIAL_SH_SCI_CONSOLE=y