diff --git a/[refs] b/[refs] index 012948cd4942..2e1543f910ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a6be3d1882743a382f18da9821a410bb29964a2 +refs/heads/master: 4ce1873634e1b0bf34fd0f00bff2144029e89247 diff --git a/trunk/arch/blackfin/include/asm/dma.h b/trunk/arch/blackfin/include/asm/dma.h index 65bf3d610a4c..30595bf3ccbd 100644 --- a/trunk/arch/blackfin/include/asm/dma.h +++ b/trunk/arch/blackfin/include/asm/dma.h @@ -109,7 +109,7 @@ struct dma_channel { struct mutex dmalock; const char *device_id; enum dma_chan_status chan_status; - struct dma_register *regs; + volatile struct dma_register *regs; struct dmasg *sg; /* large mode descriptor */ unsigned int irq; void *data;