浏览代码

fix merge conflict

Waldemar Brodkorb 7 年之前
父节点
当前提交
0fa6211049
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      target/linux/config/Config.in.serial

+ 0 - 2
target/linux/config/Config.in.serial

@@ -88,9 +88,7 @@ config ADK_KERNEL_SERIAL_8250
 						|| ADK_TARGET_SYSTEM_QEMU_XTENSA \
 						|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 						|| ADK_TARGET_SYSTEM_QEMU_NIOS2 \
-						|| ADK_TARGET_SYSTEM_QEMU_OR1K
 						|| ADK_TARGET_SYSTEM_QEMU_OR1K \
-						|| ADK_TARGET_SYSTEM_SIM_OR1K \
 						|| ADK_TARGET_SYSTEM_SOM_C6745
 	select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG