diff options
| author |   Bryan Wu <bryan.wu@analog.com> | 2008-02-02 12:28:11 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@analog.com> | 2008-02-02 12:28:11 +0800 |
| commit | 960265e22bcd4a657223e79f36643eb7e69b1a1f (patch) | |
| tree | 18a23f666e4a7da1fbd484c70a8c792355e98624 /include/asm-blackfin | |
| parent | Merge branch 'cris' of git://www.jni.nu/cris (diff) | |
| download | linux-dev-960265e22bcd4a657223e79f36643eb7e69b1a1f.tar.xz linux-dev-960265e22bcd4a657223e79f36643eb7e69b1a1f.zip | |
[Blackfin] arch: fix bug: redefinition warning when compile EZKIT548
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'include/asm-blackfin')
| -rw-r--r-- | include/asm-blackfin/mach-bf548/defBF548.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/include/asm-blackfin/mach-bf548/defBF548.h index e46f56891e6a..1d7c96edb038 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 */ |