aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf548/dma.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
commit29c798fecb9b846b363b0a02fa662ff42fc19426 (patch)
treee708d6aca8f098e69571780f702325b221b66694 /arch/blackfin/mach-bf548/dma.c
parentASoC: fix the building issue of missing codec field in 'struct snd_soc_card' (diff)
parentLinux 2.6.37-rc1 (diff)
downloadlinux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.tar.xz
linux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.zip
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'arch/blackfin/mach-bf548/dma.c')
-rw-r--r--arch/blackfin/mach-bf548/dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf548/dma.c b/arch/blackfin/mach-bf548/dma.c
index 039a6d9d38f3..888b9cc0b822 100644
--- a/arch/blackfin/mach-bf548/dma.c
+++ b/arch/blackfin/mach-bf548/dma.c
@@ -63,6 +63,7 @@ int channel2irq(unsigned int channel)
break;
case CH_SPORT1_TX:
ret_irq = IRQ_SPORT1_TX;
+ break;
case CH_SPI0:
ret_irq = IRQ_SPI0;
break;