diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-29 05:13:22 +0200 |
| commit | 9a91d51f24b366181d1a953c84232871125c6666 (patch) | |
| tree | a1bb1400683406ed20cb9177698ec6c91ff6ad27 /target/config/Config.in | |
| parent | a3f13b147ab6e48be91dedbe116411196f1448b0 (diff) | |
| parent | 83b06f4f07ae26ef02fd909f18288f43ed4c3c29 (diff) | |
resolve conflict
Diffstat (limited to 'target/config/Config.in')
| -rw-r--r-- | target/config/Config.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index d2e55fe52..ee2c5222d 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -333,6 +333,7 @@ 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" 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 |