From a566466f17ba0e2d2b6c250e77da678fb932470d Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 3 Jul 2008 23:06:36 +0200 Subject: IAD210 board: fix ``"ALIGN" redefined'' warning. Signed-off-by: Wolfgang Denk --- board/siemens/IAD210/atm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'board/siemens') diff --git a/board/siemens/IAD210/atm.c b/board/siemens/IAD210/atm.c index c77e35912..1b27f336b 100644 --- a/board/siemens/IAD210/atm.c +++ b/board/siemens/IAD210/atm.c @@ -1,4 +1,3 @@ - #include #include #include @@ -7,7 +6,7 @@ #include #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); -- cgit v1.2.3