From 0fa62110496195b2a3d3ca2c975da1a98f8eb86e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Jun 2017 22:40:25 +0200 Subject: fix merge conflict --- target/linux/config/Config.in.serial | 2 -- 1 file changed, 2 deletions(-) (limited to 'target/linux/config') diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 6cee8b08a..26d10c71e 100644 --- a/target/linux/config/Config.in.serial +++ b/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 -- cgit v1.2.3