summaryrefslogtreecommitdiff
path: root/common/cmd_immap.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
committerJon Loeliger <jdl@freescale.com>2007-12-06 11:27:32 -0600
commitf743931f9b4d4e15c9bdfe726bef033ea1f1402c (patch)
tree02c4f32797f779014b5eea46856aa50a98c65dd1 /common/cmd_immap.c
parent83c5c9b71b451dd62af5dcbddbbe291ee3a58a6e (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadu-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.zip
u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.gz
u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'common/cmd_immap.c')
-rw-r--r--common/cmd_immap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index ae95758..d758269 100644
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -28,8 +28,7 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_CMD_IMMAP) && \
- (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if defined(CONFIG_8xx) || defined(CONFIG_8260)
#if defined(CONFIG_8xx)
#include <asm/8xx_immap.h>
@@ -41,9 +40,7 @@
#include <asm/iopin_8260.h>
#endif
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
DECLARE_GLOBAL_DATA_PTR;
-#endif
static void
unimplemented ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])