diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-04 17:34:07 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-04 17:34:07 +0200 |
commit | c7352ddea44c02c2ee38250033e94ce77fd42d15 (patch) | |
tree | dbd2f4c225a797fddc75037fb6cc2f5f3a082ddd /target/config | |
parent | f3431e3a6f89b384517885e7805c8706b2c6ae5d (diff) | |
parent | 6f96b57ffa30d8e1bf6af9d1e9fae1902cb419e1 (diff) |
resolve conflict
Diffstat (limited to 'target/config')
-rw-r--r-- | target/config/Config.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index e97ce5443..787b347ea 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -365,13 +365,14 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86 + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX + default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH default "" # c library |