aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf548
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-10-15 04:22:21 +0000
committerMike Frysinger <vapier@gentoo.org>2009-12-15 00:14:25 -0500
commit5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb (patch)
treec77a98c066153709e552ede4d1ec8808b74c25b1 /arch/blackfin/mach-bf548
parentaaa225e0aa96691964a5f0518c3c16b954d400cb (diff)
downloadkernel_goldelico_gta04-5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb.zip
kernel_goldelico_gta04-5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb.tar.gz
kernel_goldelico_gta04-5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb.tar.bz2
Blackfin: rename BF542 host dma defines
All the other BF54x parts had these defines renamed to avoid collision, but it looks the BF542 was missed somehow. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf548')
-rw-r--r--arch/blackfin/mach-bf548/include/mach/defBF544.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h
index 39f588d..f916c52 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF544.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h
@@ -624,9 +624,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 */