From 5893df89c1b5cb35b1c0e2ae0927e37a2d501263 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 30 Oct 2007 12:04:53 +0800 Subject: [PATCH] --- yaml --- r: 72886 b: refs/heads/master c: 2ea4649b3634b9dbd098d0d8be65304eb2ea3a9c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-blackfin/mach-bf548/defBF549.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5571cdd5f5f9..3a805822f459 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41241c17eb11df08efa81727f9c01225cd0f56b3 +refs/heads/master: 2ea4649b3634b9dbd098d0d8be65304eb2ea3a9c diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF549.h b/trunk/include/asm-blackfin/mach-bf548/defBF549.h index 4e46d657e50e..fcb72b41e007 100644 --- a/trunk/include/asm-blackfin/mach-bf548/defBF549.h +++ b/trunk/include/asm-blackfin/mach-bf548/defBF549.h @@ -1671,7 +1671,7 @@ /* Bit masks for MXVR_DMAx_CONFIG */ #define MDMAEN 0x1 /* DMA Channel Enable */ -#define DD 0x2 /* DMA Channel Direction */ +#define DMADD 0x2 /* DMA Channel Direction */ #define BY4SWAPEN 0x20 /* DMA Channel Four Byte Swap Enable */ #define LCHAN 0x3c0 /* DMA Channel Logical Channel */ #define BITSWAPEN 0x400 /* DMA Channel Bit Swap Enable */