Title: [4150] branches/2008R1/include/asm-blackfin/mach-bf548/defBF548.h: [#3860]
fix bug: redefinition warning when compile EZKIT548
- Revision
- 4150
- Author
- cooloney
- Date
- 2008-01-27 20:14:52 -0600 (Sun, 27 Jan 2008)
Log Message
[#3860] fix bug: redefinition warning when compile EZKIT548
Diffstat
defBF548.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Modified Paths
Diff
Modified: branches/2008R1/include/asm-blackfin/mach-bf548/defBF548.h (4149 => 4150)
--- branches/2008R1/include/asm-blackfin/mach-bf548/defBF548.h 2008-01-27 16:00:40 UTC (rev 4149)
+++ branches/2008R1/include/asm-blackfin/mach-bf548/defBF548.h 2008-01-28 02:14:52 UTC (rev 4150)
@@ -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 */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
