Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=960265e22bcd4a657223e79f36643eb7e69b1a1f
Commit: 960265e22bcd4a657223e79f36643eb7e69b1a1f
Parent: 0cf975e16927fd70f34cee20d3856246c13bb4c8
Author: Bryan Wu <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 2 12:28:11 2008 +0800
Committer: Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Sat Feb 2 12:28:11 2008 +0800
[Blackfin] arch: fix bug: redefinition warning when compile EZKIT548
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
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 e46f568..1d7c96e 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
