From 960265e22bcd4a657223e79f36643eb7e69b1a1f Mon Sep 17 00:00:00 2001 From: Bryan Wu <bryan.wu@analog.com> Date: Sat, 2 Feb 2008 12:28:11 +0800 Subject: [PATCH] [Blackfin] arch: fix bug: redefinition warning when compile EZKIT548 Signed-off-by: Bryan Wu <bryan.wu@analog.com> --- include/asm-blackfin/mach-bf548/defBF548.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/include/asm-blackfin/mach-bf548/defBF548.h index e46f56891e6..1d7c96edb03 100644 --- a/include/asm-blackfin/mach-bf548/defBF548.h +++ b/include/asm-blackfin/mach-bf548/defBF548.h @@ -1010,9 +1010,9 @@ #define DMA_READY 0x1 /* DMA Ready */ #define FIFOFULL 0x2 /* FIFO Full */ #define FIFOEMPTY 0x4 /* FIFO Empty */ -#define COMPLETE 0x8 /* DMA Complete */ +#define DMA_COMPLETE 0x8 /* DMA Complete */ #define HSHK 0x10 /* Host Handshake */ -#define TIMEOUT 0x20 /* Host Timeout */ +#define HSTIMEOUT 0x20 /* Host Timeout */ #define HIRQ 0x40 /* Host Interrupt Request */ #define ALLOW_CNFG 0x80 /* Allow New Configuration */ #define DMA_DIR 0x100 /* DMA Direction */ -- 2.41.3