diff options
| author | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
|---|---|---|
| committer | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
| commit | d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995 (patch) | |
| tree | dd0722cee4758fe40f6a5cc75986ebb1a395aac2 /common/cmd_usb.c | |
| parent | f539edc076cfe52bff919dd512ba8d7af0e22092 (diff) | |
| parent | 8a92b7c60b40ff79e2cc96e13aeac2a531dde473 (diff) | |
| download | u-boot-imx-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.zip u-boot-imx-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.tar.gz u-boot-imx-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.tar.bz2 | |
Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/bcm570x.c
drivers/tigon3.c
Diffstat (limited to 'common/cmd_usb.c')
| -rw-r--r-- | common/cmd_usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 904df71..45e07f1 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -30,7 +30,7 @@ #include <asm/byteorder.h> #include <part.h> -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if defined(CONFIG_CMD_USB) #include <usb.h> @@ -609,10 +609,10 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } -#endif /* (CONFIG_COMMANDS & CFG_CMD_USB) */ +#endif -#if (CONFIG_COMMANDS & CFG_CMD_USB) +#if defined(CONFIG_CMD_USB) #ifdef CONFIG_USB_STORAGE U_BOOT_CMD( |