tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 3c729087 9d8117e7

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