diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-29 22:40:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-29 22:40:25 +0200 |
| commit | 0fa62110496195b2a3d3ca2c975da1a98f8eb86e (patch) | |
| tree | 06f0a92748d20d729b687865aa3dfed6b34fded8 /target/linux/config | |
| parent | 5ff58267602280e25be913607f360930ebaba87a (diff) | |
fix merge conflict
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.serial | 2 |
1 files changed, 0 insertions, 2 deletions
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 |