Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / arch / blackfin / mach-bf533 / dma.c

diff --git a/arch/blackfin/mach-bf533/dma.c b/arch/blackfin/mach-bf533/dma.c
index 28655c1..7a443c3 100644 (file)
--- a/arch/blackfin/mach-bf533/dma.c
+++ b/arch/blackfin/mach-bf533/dma.c
@@ -31,7 +31,7 @@
 #include <asm/blackfin.h>
 #include <asm/dma.h>
 
-struct dma_register *dma_io_base_addr[MAX_BLACKFIN_DMA_CHANNEL] = {
+struct dma_register *dma_io_base_addr[MAX_DMA_CHANNELS] = {
        (struct dma_register *) DMA0_NEXT_DESC_PTR,
        (struct dma_register *) DMA1_NEXT_DESC_PTR,
        (struct dma_register *) DMA2_NEXT_DESC_PTR,
@@ -76,12 +76,12 @@ int channel2irq(unsigned int channel)
                ret_irq = IRQ_SPI;
                break;
 
-       case CH_UART_RX:
-               ret_irq = IRQ_UART_RX;
+       case CH_UART0_RX:
+               ret_irq = IRQ_UART0_RX;
                break;
 
-       case CH_UART_TX:
-               ret_irq = IRQ_UART_TX;
+       case CH_UART0_TX:
+               ret_irq = IRQ_UART0_TX;
                break;
 
        case CH_MEM_STREAM0_SRC: