]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[Blackfin] arch: fix bug: redefinition warning when compile EZKIT548
authorBryan Wu <bryan.wu@analog.com>
Sat, 2 Feb 2008 04:28:11 +0000 (12:28 +0800)
committerBryan Wu <bryan.wu@analog.com>
Sat, 2 Feb 2008 04:28:11 +0000 (12:28 +0800)
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
include/asm-blackfin/mach-bf548/defBF548.h

index e46f56891e6a28f443e7ab518e1ce8d79834c856..1d7c96edb03839a4cff15b76cbf8c2ada0c82fdf 100644 (file)
 #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 */