From 74676395bf5f545d3206742d6ebcb8d30581f77b Mon Sep 17 00:00:00 2001 From: Steven Miao Date: Fri, 25 May 2012 11:32:03 +0800 Subject: [PATCH] --- yaml --- r: 313809 b: refs/heads/master c: e70f466067ef980876d6a190426b3670bccee4a7 h: refs/heads/master i: 313807: f380aed1737dea174c939fe9ab5d7e4b89fd8d61 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/bfin_dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eafcb7c50345..69428a0ad981 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a75b3c06c1d400b2b5be25ea2453a5f6b77540ea +refs/heads/master: e70f466067ef980876d6a190426b3670bccee4a7 diff --git a/trunk/arch/blackfin/kernel/bfin_dma.c b/trunk/arch/blackfin/kernel/bfin_dma.c index c166939ffb2b..4a32f2dd5ddc 100644 --- a/trunk/arch/blackfin/kernel/bfin_dma.c +++ b/trunk/arch/blackfin/kernel/bfin_dma.c @@ -45,7 +45,7 @@ static int __init blackfin_dma_init(void) atomic_set(&dma_ch[i].chan_status, 0); dma_ch[i].regs = dma_io_base_addr[i]; } -#ifdef CH_MEM_STREAM3_SRC +#if defined(CH_MEM_STREAM3_SRC) && defined(CONFIG_BF60x) /* Mark MEMDMA Channel 3 as requested since we're using it internally */ request_dma(CH_MEM_STREAM3_DEST, "Blackfin dma_memcpy"); request_dma(CH_MEM_STREAM3_SRC, "Blackfin dma_memcpy"); @@ -361,7 +361,7 @@ void __init early_dma_memcpy_done(void) __builtin_bfin_ssync(); } -#ifdef CH_MEM_STREAM3_SRC +#if defined(CH_MEM_STREAM3_SRC) && defined(CONFIG_BF60x) #define bfin_read_MDMA_S_CONFIG bfin_read_MDMA_S3_CONFIG #define bfin_write_MDMA_S_CONFIG bfin_write_MDMA_S3_CONFIG #define bfin_write_MDMA_S_START_ADDR bfin_write_MDMA_S3_START_ADDR