summaryrefslogtreecommitdiff
path: root/board/pcippc2/pcippc2.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 /board/pcippc2/pcippc2.c
parent69df3c4da0c93017cceb25a366e794570bd0ed98 (diff)
parent66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff)
downloadu-boot-imx-b8685affe614ccf5f4ec66252b30e2e524d18948.zip
u-boot-imx-b8685affe614ccf5f4ec66252b30e2e524d18948.tar.gz
u-boot-imx-b8685affe614ccf5f4ec66252b30e2e524d18948.tar.bz2
Merge git://www.denx.de/git/u-boot
Conflicts: CREDITS
Diffstat (limited to 'board/pcippc2/pcippc2.c')
-rw-r--r--board/pcippc2/pcippc2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index a216c55..1148c6a 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -202,7 +202,7 @@ void watchdog_reset (void)
enable_interrupts ();
}
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
switch (argc) {
@@ -241,5 +241,5 @@ U_BOOT_CMD(
"wd - print current status\n"
);
-#endif /* CFG_CMD_BSP */
+#endif
#endif /* CONFIG_WATCHDOG */