diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /include/asm-blackfin/mach-bf548/defBF548.h | |
parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
download | kernel_samsung_tuna-c99da91e7a12724127475a85cc7a38214b3504e2.zip kernel_samsung_tuna-c99da91e7a12724127475a85cc7a38214b3504e2.tar.gz kernel_samsung_tuna-c99da91e7a12724127475a85cc7a38214b3504e2.tar.bz2 |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-blackfin/mach-bf548/defBF548.h')
-rw-r--r-- | include/asm-blackfin/mach-bf548/defBF548.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/include/asm-blackfin/mach-bf548/defBF548.h index 70af33c..ecbca95 100644 --- a/include/asm-blackfin/mach-bf548/defBF548.h +++ b/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 */ |