aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-09-10 16:17:25 +0200
committerWolfgang Denk <wd@denx.de>2011-09-10 16:17:25 +0200
commit3aa7782ac4fa78a159479060495c469cbf0c5a84 (patch)
treecbba56bd288bccd0e3f296adc75c4d93b912fb31
parent5fb5e8c5e75f9e4ee26ee0ecbf67854b63964bc1 (diff)
downloadu-boot-linaro-stable-3aa7782ac4fa78a159479060495c469cbf0c5a84.tar.gz
tegra2: fix warning: "assert" redefined
Commit 21726a7 "Add assert() for debug assertions" caused build warnings for all tegra2 based boards: clock.c:36:1: warning: "assert" redefined In file included from clock.c:29: include/common.h:144:1: warning: this is the location of the previous definition Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/cpu/armv7/tegra2/clock.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra2/clock.c
index 67eed1404..0aaed7d94 100644
--- a/arch/arm/cpu/armv7/tegra2/clock.c
+++ b/arch/arm/cpu/armv7/tegra2/clock.c
@@ -28,14 +28,6 @@
#include <asm/arch/tegra2.h>
#include <common.h>
-#ifdef DEBUG
-#define assert(x) \
- ({ if (!(x)) printf("Assertion failure '%s' %s line %d\n", \
- #x, __FILE__, __LINE__); })
-#else
-#define assert(x)
-#endif
-
/*
* Get the oscillator frequency, from the corresponding hardware configuration
* field.