projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
[oweals/u-boot.git]
/
include
/
configs
/
km
/
km_arm.h
diff --git
a/include/configs/km/km_arm.h
b/include/configs/km/km_arm.h
index 540d59e82875c3e5810577bcccf7afb277e93bf3..700124c0c43281881210e665579d607608de0ad9 100644
(file)
--- a/
include/configs/km/km_arm.h
+++ b/
include/configs/km/km_arm.h
@@
-260,7
+260,6
@@
int get_scl(void);
#if defined(CONFIG_SYS_NO_FLASH)
#define CONFIG_KM_UBI_PARTITION_NAME "ubi0"
#undef CONFIG_FLASH_CFI_MTD
-#undef CONFIG_CMD_JFFS2
#undef CONFIG_JFFS2_CMDLINE
#endif