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 commit 'u-boot/master' into for-1.3.1
[platform/kernel/u-boot.git]
/
common
/
cmd_ext2.c
diff --git
a/common/cmd_ext2.c
b/common/cmd_ext2.c
index
94bd9b6
..
f569406
100644
(file)
--- a/
common/cmd_ext2.c
+++ b/
common/cmd_ext2.c
@@
-34,15
+34,13
@@
*/
#include <common.h>
#include <part.h>
*/
#include <common.h>
#include <part.h>
-
-#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
#include <config.h>
#include <command.h>
#include <image.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <ext2fs.h>
#include <config.h>
#include <command.h>
#include <image.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <ext2fs.h>
-#if
((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE)
)
+#if
defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE
)
#include <usb.h>
#endif
#include <usb.h>
#endif
@@
-259,5
+257,3
@@
U_BOOT_CMD(
" - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from ext2 filesystem\n"
);
" - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from ext2 filesystem\n"
);
-
-#endif /* CONFIG_COMMANDS & CFG_CMD_EXT2 */