From: Wolfgang Denk <wd@denx.de>
Date: Thu, 3 Jul 2008 21:06:36 +0000 (+0200)
Subject: IAD210 board: fix ``"ALIGN" redefined'' warning.
X-Git-Tag: v1.3.4-rc1~90^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a566466f17ba0e2d2b6c250e77da678fb932470d;p=oweals%2Fu-boot.git

IAD210 board: fix ``"ALIGN" redefined'' warning.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/board/siemens/IAD210/atm.c b/board/siemens/IAD210/atm.c
index c77e35912e..1b27f336b2 100644
--- a/board/siemens/IAD210/atm.c
+++ b/board/siemens/IAD210/atm.c
@@ -1,4 +1,3 @@
-
 #include <common.h>
 #include <mpc8xx.h>
 #include <commproc.h>
@@ -7,7 +6,7 @@
 #include <linux/stddef.h>
 
 #define SYNC __asm__("sync")
-#define ALIGN(p, a) ((char *)(((uint32)(p)+(a)-1) & ~((uint32)(a)-1)))
+#define MY_ALIGN(p, a) ((char *)(((uint32)(p)+(a)-1) & ~((uint32)(a)-1)))
 
 #define FALSE  1
 #define TRUE   0
@@ -160,7 +159,7 @@ int atmMemInit()
   g_atm.csram = &csram[0];
   memset(&(g_atm.csram), 0x00, g_atm.csram_size);
 
-  g_atm.int_reload_ptr = (uint32 *)ALIGN(g_atm.csram, 4);
+  g_atm.int_reload_ptr = (uint32 *)MY_ALIGN(g_atm.csram, 4);
   g_atm.rbd_base_ptr = (struct atm_bd_t *)(g_atm.int_reload_ptr + NUM_INT_ENTRIES);
   g_atm.tbd_base_ptr = (struct atm_bd_t *)(g_atm.rbd_base_ptr + total_num_rbd);