projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
common
/
usb_storage.c
diff --git
a/common/usb_storage.c
b/common/usb_storage.c
index
196ceb7
..
0f79f36
100644
(file)
--- a/
common/usb_storage.c
+++ b/
common/usb_storage.c
@@
-55,7
+55,7
@@
#include <asm/processor.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_USB)
+#if
defined(CONFI
G_CMD_USB)
#include <part.h>
#include <usb.h>
@@
-1249,4
+1249,4
@@
int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
}
#endif /* CONFIG_USB_STORAGE */
-#endif
/* CFG_CMD_USB */
+#endif