diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
| commit | ebf9022f2eee564fc4b0e4b37a8267319923d808 (patch) | |
| tree | 407715e96a34f57b194198c24099cd7b627ae714 /arch/arm/configs/animeo_ip_defconfig | |
| parent | a293dc2753433f8052f9471b2d0cc19f01c50739 (diff) | |
| parent | 7359e2852249758f6fb12dae9a0d57a197b7a769 (diff) | |
| download | barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.gz barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.xz | |
Merge branch 'for-next/rs485'
Conflicts:
common/console_common.c
Diffstat (limited to 'arch/arm/configs/animeo_ip_defconfig')
| -rw-r--r-- | arch/arm/configs/animeo_ip_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/animeo_ip_defconfig b/arch/arm/configs/animeo_ip_defconfig index 7f6961f9c3..e076162b45 100644 --- a/arch/arm/configs/animeo_ip_defconfig +++ b/arch/arm/configs/animeo_ip_defconfig @@ -16,7 +16,6 @@ CONFIG_PROMPT_HUSH_PS2="y" CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/animeo_ip/env" CONFIG_CMD_EDIT=y |