Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / blackfin / mach-bf548 / dma.c

diff --git a/arch/blackfin/mach-bf548/dma.c b/arch/blackfin/mach-bf548/dma.c
index 74730eb8ae1bf41208d3da8b67b15fde18246f0c..d9239bc05dd4a945b1a0ea6048cfff2ecdc510f7 100644 (file)
--- a/arch/blackfin/mach-bf548/dma.c
+++ b/arch/blackfin/mach-bf548/dma.c
@@ -32,7 +32,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,
@@ -91,16 +91,16 @@ int channel2irq(unsigned int channel)
                ret_irq = IRQ_SPI1;
                break;
        case CH_UART0_RX:
-               ret_irq = IRQ_UART_RX;
+               ret_irq = IRQ_UART0_RX;
                break;
        case CH_UART0_TX:
-               ret_irq = IRQ_UART_TX;
+               ret_irq = IRQ_UART0_TX;
                break;
        case CH_UART1_RX:
-               ret_irq = IRQ_UART_RX;
+               ret_irq = IRQ_UART1_RX;
                break;
        case CH_UART1_TX:
-               ret_irq = IRQ_UART_TX;
+               ret_irq = IRQ_UART1_TX;
                break;
        case CH_EPPI0:
                ret_irq = IRQ_EPPI0;