diff options
| author | Stefano Babic <[email protected]> | 2016-05-24 14:55:06 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2016-05-24 14:55:06 +0200 |
| commit | 08ca213acadef61748dc62d48b0f5c4bed8b8c2d (patch) | |
| tree | 36cf415b78775ee63acdfc34d636d2b7d7936a78 /cmd/disk.c | |
| parent | d15a244b059e361475302bccd471e65a48ee2b1f (diff) | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'cmd/disk.c')
| -rw-r--r-- | cmd/disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/disk.c b/cmd/disk.c index 2fd1717e6a4..fcc41231271 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -8,7 +8,7 @@ #include <command.h> #include <part.h> -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_SCSI) || \ +#if defined(CONFIG_CMD_IDE) || defined(CONFIG_SCSI) || \ defined(CONFIG_USB_STORAGE) int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, char *const argv[]) |