diff options
author | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:35 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:35 -0400 |
commit | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (patch) | |
tree | f4c9c40f9353fbe4104875779c7eedd3ed2342cc /lib/vsprintf.c | |
parent | 0a5228be868622894a5f8f226203cd7bac562187 (diff) | |
parent | 73c02e5e4fc1ef53d06289232edd6cc52e3d73f6 (diff) |
Merge tag 'pull-12apr19' of git://git.denx.de/u-boot-dm
fdtdec tests and improvements for carve-outs
pinctrl race-condition fix
various other fixes in sandbox, sound, mkimage, etc.
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r-- | lib/vsprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 1b6c154d8d7..2403825dc98 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -457,7 +457,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, return device_path_string(buf, end, ptr, field_width, precision, flags); #endif -#ifdef CONFIG_CMD_NET case 'a': flags |= SPECIAL | ZEROPAD; @@ -469,6 +468,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, break; } break; +#ifdef CONFIG_CMD_NET case 'm': flags |= SPECIAL; /* Fallthrough */ |