diff options
| author | Minkyu Kang <[email protected]> | 2010-05-31 09:13:11 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-05-31 09:13:11 +0900 |
| commit | 922d27b596c179c5a7d68abe45ede5adb1b6589c (patch) | |
| tree | c5ef3d5dc70bf51646a7fd7a379f6c2b2588cc2e /include/configs/AP1000.h | |
| parent | de200874fb9ecac51d74b4e9783ebb5d2e94c449 (diff) | |
| parent | 39c209546ab5b11ca6410c5cc57dcbf457e50800 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'include/configs/AP1000.h')
| -rw-r--r-- | include/configs/AP1000.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index ec982bdc512..ae0a8731fa3 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_COMMAND_EDIT 1 -#define CONFIG_COMMAND_HISTORY 1 #define CONFIG_COMPLETE_ADDRESSES 1 #define CONFIG_ENV_IS_IN_FLASH 1 |