diff options
| author | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
| commit | 933e74c07231e815bbfd9ed90073308eaf253a00 (patch) | |
| tree | f1733a1feb58ecf8f2d51eb9585edd2ee23f648b /target/config | |
| parent | 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff) | |
| parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/config')
| -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 6fee28c9e..33ae6f44f 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -181,6 +181,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP 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 |