Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3c729087d4312a4a1fa1a8b674fd9c8050cfc3db

Authored by Linus Torvalds
2 parents 9d8117e72b cb922d2596

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… 

…/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: McBSP: tx_irq_completion used in rx_irq_handler
  omap: Fix compile dependency to LEDS_CLASS

Showing 2 changed files Side-by-side Diff

arch/arm/plat-omap/Kconfig
Diff comments   View file @ 3c72908
... ... @@ -33,7 +33,7 @@
33 33 config OMAP_DEBUG_LEDS
34 34 bool
35 35 depends on OMAP_DEBUG_DEVICES
36   - default y if LEDS
  36 + default y if LEDS_CLASS
37 37  
38 38 config OMAP_RESET_CLOCKS
39 39 bool "Reset unused clocks during boot"
arch/arm/plat-omap/mcbsp.c
Diff comments   View file @ 3c72908
... ... @@ -156,7 +156,7 @@
156 156 /* Writing zero to RSYNC_ERR clears the IRQ */
157 157 MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1));
158 158 } else {
159   - complete(&mcbsp_rx->tx_irq_completion);
  159 + complete(&mcbsp_rx->rx_irq_completion);
160 160 }
161 161  
162 162 return IRQ_HANDLED;