summaryrefslogtreecommitdiff
path: root/common/cmd_usb.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
committerJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
commitf743931f9b4d4e15c9bdfe726bef033ea1f1402c (patch)
tree02c4f32797f779014b5eea46856aa50a98c65dd1 /common/cmd_usb.c
parent83c5c9b71b451dd62af5dcbddbbe291ee3a58a6e (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadu-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.zip
u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.gz
u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'common/cmd_usb.c')
-rw-r--r--common/cmd_usb.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 45e07f1..c6b17c2 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -29,9 +29,6 @@
#include <command.h>
#include <asm/byteorder.h>
#include <part.h>
-
-#if defined(CONFIG_CMD_USB)
-
#include <usb.h>
#ifdef CONFIG_USB_STORAGE
@@ -608,12 +605,6 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1;
}
-
-#endif
-
-
-#if defined(CONFIG_CMD_USB)
-
#ifdef CONFIG_USB_STORAGE
U_BOOT_CMD(
usb, 5, 1, do_usb,
@@ -645,4 +636,3 @@ U_BOOT_CMD(
"usb info [dev] - show available USB devices\n"
);
#endif
-#endif