]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
tegra2: fix warning: "assert" redefined
authorWolfgang Denk <wd@denx.de>
Sat, 10 Sep 2011 14:17:25 +0000 (16:17 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 10 Sep 2011 14:17:25 +0000 (16:17 +0200)
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>
arch/arm/cpu/armv7/tegra2/clock.c

index 67eed14044e7e5ec499fb3a7220c8fbe2c60167c..0aaed7d948ceb4476bcc3bfd51b5fb800f9db2bd 100644 (file)
 #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.