summaryrefslogtreecommitdiff
path: root/common/cmd_elf.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-11-10 10:04:51 -0600
committerJon Loeliger <jdl@freescale.com>2008-11-10 10:04:51 -0600
commit33211469f7d7e2afacf103cc55790f734572f7a6 (patch)
tree7c374cde48fba08b52b4f83bdf00aae89d7f85a3 /common/cmd_elf.c
parent1266df887781c779deaf6d05eea2ef90a470cb34 (diff)
parent1378174a1351c0285736863a665ab758fe8d5f71 (diff)
downloadu-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.zip
u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.gz
u-boot-imx-33211469f7d7e2afacf103cc55790f734572f7a6.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'common/cmd_elf.c')
-rw-r--r--common/cmd_elf.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 3ebb6d9..4d8e1d2 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -23,10 +23,6 @@
DECLARE_GLOBAL_DATA_PTR;
#endif
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
int valid_elf_image (unsigned long addr);
unsigned long load_elf_image (unsigned long addr);