projects
/
platform
/
kernel
/
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-fsl-qoriq
[platform/kernel/u-boot.git]
/
include
/
configs
/
charon.h
diff --git
a/include/configs/charon.h
b/include/configs/charon.h
index
2f537e0
..
578c108
100644
(file)
--- a/
include/configs/charon.h
+++ b/
include/configs/charon.h
@@
-34,7
+34,6
@@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"
-
/* additional features on charon board */
#define CONFIG_RESET_PHY_R