diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-30 10:07:08 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-30 10:07:08 +0200 |
| commit | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (patch) | |
| tree | 33ad7fe298698b4b59d53751b6b050e7e86dea34 /common/cmd_bootm.c | |
| parent | b8ec9fb736abd99bff071bdf809951ea1b8a5dff (diff) | |
| parent | 5c374c9ee16fee2bf68533cc4010b3c0df21f783 (diff) | |
| download | u-boot-imx-b2b15ebb66f0e7958dff8916077da0aceb2982a8.zip u-boot-imx-b2b15ebb66f0e7958dff8916077da0aceb2982a8.tar.gz u-boot-imx-b2b15ebb66f0e7958dff8916077da0aceb2982a8.tar.bz2 | |
Merge branch 'hammerhead' of git://git.denx.de/u-boot-avr32
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1c0a416..4040a69 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -36,7 +36,7 @@ #include <lmb.h> #include <asm/byteorder.h> -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if (CONFIG_CMD_USB) #include <usb.h> #endif @@ -217,7 +217,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) */ iflag = disable_interrupts(); -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if (CONFIG_CMD_USB) /* * turn off USB to prevent the host controller from writing to the * SDRAM while Linux is booting. This could happen (at least for OHCI |