diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
| commit | 746c4b9490495dc4381dbcc49f40078d423e0a48 (patch) | |
| tree | e726020abb9e37df1fca19d8895bf203b27612d1 /api/api_storage.c | |
| parent | 3f2ac8f928c76cbd2374437b2d079f8b4324aaba (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
| download | olio-uboot-2014.01-746c4b9490495dc4381dbcc49f40078d423e0a48.tar.xz olio-uboot-2014.01-746c4b9490495dc4381dbcc49f40078d423e0a48.zip | |
Merge commit 'wd/master'
Diffstat (limited to 'api/api_storage.c')
| -rw-r--r-- | api/api_storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/api_storage.c b/api/api_storage.c index 7cd4efb45..7e6324044 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -61,21 +61,21 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, }; void dev_stor_init(void) { -#if (CONFIG_COMMANDS & CFG_CMD_IDE) +#if defined(CONFIG_CMD_IDE) specs[ENUM_IDE].max_dev = CFG_IDE_MAXDEVICE; specs[ENUM_IDE].enum_started = 0; specs[ENUM_IDE].enum_ended = 0; specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE; specs[ENUM_IDE].name = "ide"; #endif -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if defined(CONFIG_CMD_USB) specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV; specs[ENUM_USB].enum_started = 0; specs[ENUM_USB].enum_ended = 0; specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB; specs[ENUM_USB].name = "usb"; #endif -#if (CONFIG_COMMANDS & CFG_CMD_SCSI) +#if defined(CONFIG_CMD_SCSI) specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE; specs[ENUM_SCSI].enum_started = 0; specs[ENUM_SCSI].enum_ended = 0; |