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-coldfire
[platform/kernel/u-boot.git]
/
include
/
configs
/
meson64_android.h
diff --git
a/include/configs/meson64_android.h
b/include/configs/meson64_android.h
index
1266851
..
c0e977a
100644
(file)
--- a/
include/configs/meson64_android.h
+++ b/
include/configs/meson64_android.h
@@
-279,7
+279,7
@@
"fi;" \
"fi;"
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
EXTRA_ANDROID_ENV_SETTINGS \
"partitions=" PARTS_DEFAULT "\0" \
"mmcdev=2\0" \