diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/blackfin/mach-bf537/dma.c | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/blackfin/mach-bf537/dma.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf537/dma.c b/arch/blackfin/mach-bf537/dma.c index 81185051de91..d23fc0edf2b9 100644 --- a/arch/blackfin/mach-bf537/dma.c +++ b/arch/blackfin/mach-bf537/dma.c | |||
| @@ -96,12 +96,12 @@ int channel2irq(unsigned int channel) | |||
| 96 | ret_irq = IRQ_SPI; | 96 | ret_irq = IRQ_SPI; |
| 97 | break; | 97 | break; |
| 98 | 98 | ||
| 99 | case CH_UART_RX: | 99 | case CH_UART0_RX: |
| 100 | ret_irq = IRQ_UART_RX; | 100 | ret_irq = IRQ_UART0_RX; |
| 101 | break; | 101 | break; |
| 102 | 102 | ||
| 103 | case CH_UART_TX: | 103 | case CH_UART0_TX: |
| 104 | ret_irq = IRQ_UART_TX; | 104 | ret_irq = IRQ_UART0_TX; |
| 105 | break; | 105 | break; |
| 106 | 106 | ||
| 107 | case CH_MEM_STREAM0_SRC: | 107 | case CH_MEM_STREAM0_SRC: |