summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-31 12:30:40 +0200
committerWolfgang Denk <wd@denx.de>2008-07-31 12:30:40 +0200
commitf7c602ac8be0bcff4e573052c47e79bc46dab380 (patch)
treeb987f7a2e05fc81167335ec949b17cbc9cd67df3 /common/cmd_bootm.c
parent3c95960e526b3b026da20201db64526f46faf14b (diff)
parent9196b44334c330cc13de2464c59181e4db71f549 (diff)
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 4040a691dd7..18682fe5a24 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -36,7 +36,7 @@
#include <lmb.h>
#include <asm/byteorder.h>
-#if (CONFIG_CMD_USB)
+#if defined(CONFIG_CMD_USB)
#include <usb.h>
#endif
@@ -217,7 +217,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
*/
iflag = disable_interrupts();
-#if (CONFIG_CMD_USB)
+#if defined(CONFIG_CMD_USB)
/*
* turn off USB to prevent the host controller from writing to the
* SDRAM while Linux is booting. This could happen (at least for OHCI