diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /common/usb_storage.c | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2 | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/usb_storage.c')
| -rw-r--r-- | common/usb_storage.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c index d8fbb69..94f659f 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -55,13 +55,9 @@ #include <asm/byteorder.h> #include <asm/processor.h> - -#if defined(CONFIG_CMD_USB) #include <part.h> #include <usb.h> -#ifdef CONFIG_USB_STORAGE - #undef USB_STOR_DEBUG #undef BBB_COMDAT_TRACE #undef BBB_XPORT_TRACE @@ -1242,6 +1238,3 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t USB_STOR_PRINTF("partype: %d\n",dev_desc->part_type); return 1; } - -#endif /* CONFIG_USB_STORAGE */ -#endif |