summaryrefslogtreecommitdiffstats
path: root/common/cmd_cache.c
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-09-23 01:29:43 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-09-23 01:29:43 +0900
commitb8685affe614ccf5f4ec66252b30e2e524d18948 (patch)
tree05bc55b8a4a0451e6500f1f52651d81c0f48f012 /common/cmd_cache.c
parent69df3c4da0c93017cceb25a366e794570bd0ed98 (diff)
parent66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff)
downloadtalos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.tar.gz
talos-obmc-uboot-b8685affe614ccf5f4ec66252b30e2e524d18948.zip
Merge git://www.denx.de/git/u-boot
Conflicts: CREDITS
Diffstat (limited to 'common/cmd_cache.c')
-rw-r--r--common/cmd_cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index 6c250bc1c0..675d43fa18 100644
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <command.h>
-#if (CONFIG_COMMANDS & CFG_CMD_CACHE)
+#if defined(CONFIG_CMD_CACHE)
static int on_off (const char *);
@@ -109,4 +109,4 @@ U_BOOT_CMD(
" - enable or disable data (writethrough) cache\n"
);
-#endif /* CFG_CMD_CACHE */
+#endif
OpenPOWER on IntegriCloud