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/sh/kernel/qemu-sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'target/sh') 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 -- cgit v1.2.3