diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-03 18:10:17 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-03 18:10:17 -0500 |
| commit | 2ae43a26405498fcaaec2132db82a2487ad6747b (patch) | |
| tree | baafe4b77ce234e1d67cf7d4279a782e4058f6bb /cmd/blk_common.c | |
| parent | 1297989804d66c8db92efbf9fa2e6cc76965a943 (diff) | |
| parent | c9f417b28a2460018206b821baf38217bb1c3211 (diff) | |
Merge branch '2019-12-03-master-imports'
- omapl138_lcdk fixes
- MediaTek MT8518 support
- VxWorks standard DTB support
- Assorted bug fixes
Diffstat (limited to 'cmd/blk_common.c')
| -rw-r--r-- | cmd/blk_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/blk_common.c b/cmd/blk_common.c index cee25a0d410..c5514cf8f8e 100644 --- a/cmd/blk_common.c +++ b/cmd/blk_common.c @@ -11,7 +11,6 @@ #include <common.h> #include <blk.h> -#ifdef CONFIG_HAVE_BLOCK_DEVICE int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, int *cur_devnump) { @@ -96,4 +95,3 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, } } } -#endif |