diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 00:22:21 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-15 00:14:25 -0500 |
| commit | 5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb (patch) | |
| tree | c77a98c066153709e552ede4d1ec8808b74c25b1 | |
| parent | aaa225e0aa96691964a5f0518c3c16b954d400cb (diff) | |
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>
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF544.h | 4 |
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 39f588dcd382..f916c52a148a 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h | |||
| @@ -624,9 +624,9 @@ | |||
| 624 | #define DMA_READY 0x1 /* DMA Ready */ | 624 | #define DMA_READY 0x1 /* DMA Ready */ |
| 625 | #define FIFOFULL 0x2 /* FIFO Full */ | 625 | #define FIFOFULL 0x2 /* FIFO Full */ |
| 626 | #define FIFOEMPTY 0x4 /* FIFO Empty */ | 626 | #define FIFOEMPTY 0x4 /* FIFO Empty */ |
| 627 | #define COMPLETE 0x8 /* DMA Complete */ | 627 | #define DMA_COMPLETE 0x8 /* DMA Complete */ |
| 628 | #define HSHK 0x10 /* Host Handshake */ | 628 | #define HSHK 0x10 /* Host Handshake */ |
| 629 | #define TIMEOUT 0x20 /* Host Timeout */ | 629 | #define HSTIMEOUT 0x20 /* Host Timeout */ |
| 630 | #define HIRQ 0x40 /* Host Interrupt Request */ | 630 | #define HIRQ 0x40 /* Host Interrupt Request */ |
| 631 | #define ALLOW_CNFG 0x80 /* Allow New Configuration */ | 631 | #define ALLOW_CNFG 0x80 /* Allow New Configuration */ |
| 632 | #define DMA_DIR 0x100 /* DMA Direction */ | 632 | #define DMA_DIR 0x100 /* DMA Direction */ |