ARM: davinci: Avoid name collisions

[karo-tx-linux.git] / drivers / dma / edma.c

diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 57c3f3e5321257a11e26b9e2277213b3c65f64a2..f5f200c2fadb4ba7080c8ae434c04fe18a4169ee 100644 (file)
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -468,7 +468,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
        edma_pause(echan->ch_num);
 
        switch (ch_status) {
-       case DMA_COMPLETE:
+       case EDMA_COMPLETE:
                spin_lock_irqsave(&echan->vchan.lock, flags);
 
                edesc = echan->edesc;
@@ -487,7 +487,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
                spin_unlock_irqrestore(&echan->vchan.lock, flags);
 
                break;
-       case DMA_CC_ERROR:
+       case EDMA_CC_ERROR:
                spin_lock_irqsave(&echan->vchan.lock, flags);
 
                edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p);