diff --git a/[refs] b/[refs] index 5fd98cee1797..961f0c117761 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc4d6f36db4b24bf328a5fd70038a2e609b9f028 +refs/heads/master: 76068c3c5dee4332f532573b6423d75c3e14f660 diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c index 704419e4da20..763ed84ba459 100644 --- a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c @@ -20,6 +20,11 @@ #include #include +/* + * To make sure we work around 05000119 - we always check DMA_DONE bit, + * never the DMA_RUN bit + */ + struct dma_channel dma_ch[MAX_DMA_CHANNELS]; EXPORT_SYMBOL(dma_ch);