diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-03 23:06:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-03 23:06:36 +0200 |
| commit | a566466f17ba0e2d2b6c250e77da678fb932470d (patch) | |
| tree | 85f1266dabaff5ab502daa87f713af7486265161 /board/siemens | |
| parent | ad756314797c16fa5dca23e115aab881011f164f (diff) | |
| download | blackbird-obmc-uboot-a566466f17ba0e2d2b6c250e77da678fb932470d.tar.gz blackbird-obmc-uboot-a566466f17ba0e2d2b6c250e77da678fb932470d.zip | |
IAD210 board: fix ``"ALIGN" redefined'' warning.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/siemens')
| -rw-r--r-- | board/siemens/IAD210/atm.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |
