From 30b74c972c70211e563051c111bac25de103ccf6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 21 Nov 2007 16:17:11 +0800 Subject: [PATCH] --- yaml --- r: 74137 b: refs/heads/master c: f26825de49d2e1a12eee54cd855b56b768f4d7bd h: refs/heads/master i: 74135: 9d312d56b11871256767d63421256c37add5469c v: v3 --- [refs] | 2 +- trunk/include/asm-blackfin/mach-bf548/defBF544.h | 2 +- trunk/include/asm-blackfin/mach-bf548/defBF548.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5496fecec05..f77ea68ed3eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0187854d902f897f98a1712fa9f097b13d7a554 +refs/heads/master: f26825de49d2e1a12eee54cd855b56b768f4d7bd diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF544.h b/trunk/include/asm-blackfin/mach-bf548/defBF544.h index 760307e34b9e..b8b9870e2697 100644 --- a/trunk/include/asm-blackfin/mach-bf548/defBF544.h +++ b/trunk/include/asm-blackfin/mach-bf548/defBF544.h @@ -645,7 +645,7 @@ /* Bit masks for HOST_STATUS */ -#define READY 0x1 /* DMA Ready */ +#define DMA_READY 0x1 /* DMA Ready */ #define FIFOFULL 0x2 /* FIFO Full */ #define FIFOEMPTY 0x4 /* FIFO Empty */ #define COMPLETE 0x8 /* DMA Complete */ diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF548.h b/trunk/include/asm-blackfin/mach-bf548/defBF548.h index 70af33c963b0..ecbca952985c 100644 --- a/trunk/include/asm-blackfin/mach-bf548/defBF548.h +++ b/trunk/include/asm-blackfin/mach-bf548/defBF548.h @@ -1007,7 +1007,7 @@ /* Bit masks for HOST_STATUS */ -#define READY 0x1 /* DMA Ready */ +#define DMA_READY 0x1 /* DMA Ready */ #define FIFOFULL 0x2 /* FIFO Full */ #define FIFOEMPTY 0x4 /* FIFO Empty */ #define COMPLETE 0x8 /* DMA Complete */