Merge branch 'asus' into release

[sfrench/cifs-2.6.git] / arch / blackfin / mach-bf537 / dma.c

diff --git a/arch/blackfin/mach-bf537/dma.c b/arch/blackfin/mach-bf537/dma.c
index 81185051de91eeeb788662432e9173385511fe1b..d23fc0edf2b956cca2e15f63cb7e832f55c0dee0 100644 (file)
--- a/arch/blackfin/mach-bf537/dma.c
+++ b/arch/blackfin/mach-bf537/dma.c
@@ -96,12 +96,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: