projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
arch
/
blackfin
/
mach-bf533
/
dma.c
diff --git
a/arch/blackfin/mach-bf533/dma.c
b/arch/blackfin/mach-bf533/dma.c
index
0a6eb8f
..
7a443c3
100644
(file)
--- a/
arch/blackfin/mach-bf533/dma.c
+++ b/
arch/blackfin/mach-bf533/dma.c
@@
-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_UART
0
_RX:
+ ret_irq = IRQ_UART
0
_RX;
break;
- case CH_UART_TX:
- ret_irq = IRQ_UART_TX;
+ case CH_UART
0
_TX:
+ ret_irq = IRQ_UART
0
_TX;
break;
case CH_MEM_STREAM0_SRC: