summaryrefslogtreecommitdiff
path: root/common/usb_storage.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-13 01:40:38 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-13 01:40:38 +0200
commitd6e9ee92e890f67594ab150689510df361133ead (patch)
treed76987f91295c1e4585130f6d2f43b28fae6fa94 /common/usb_storage.c
parentf5acb9fd9bba1160de3ef349c7d33fe510eda286 (diff)
downloadu-boot-imx-d6e9ee92e890f67594ab150689510df361133ead.zip
u-boot-imx-d6e9ee92e890f67594ab150689510df361133ead.tar.gz
u-boot-imx-d6e9ee92e890f67594ab150689510df361133ead.tar.bz2
common: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r--common/usb_storage.c7
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