diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
commit | 4a9146c29573dbfa661918280d9522a01f6ca919 (patch) | |
tree | b1b135237dcfee94a27e8df7ce2208230c28b894 /drivers/mtd/spi/sandbox.c | |
parent | f30924739975b4f60c0862b539790fdcdb7da20c (diff) | |
parent | 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1 (diff) |
Merge tag 'dm-pull-10jul20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata: better phandle and compatible-string support
patman support for Python3 on Ubuntu 14.04
new checkpatch check to avoid #ifdefs
Diffstat (limited to 'drivers/mtd/spi/sandbox.c')
-rw-r--r-- | drivers/mtd/spi/sandbox.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 8cbe97ee20..0b602dc914 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -44,7 +44,6 @@ enum sandbox_sf_state { SF_WRITE_STATUS, /* write the flash's status register */ }; -#if CONFIG_IS_ENABLED(LOG) static const char *sandbox_sf_state_name(enum sandbox_sf_state state) { static const char * const states[] = { @@ -53,7 +52,6 @@ static const char *sandbox_sf_state_name(enum sandbox_sf_state state) }; return states[state]; } -#endif /* LOG */ /* Bits for the status register */ #define STAT_WIP (1 << 0) |