diff options
| author | Linus Torvalds | 2010-10-01 10:53:06 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-01 10:53:06 -0700 |
| commit | 3c729087d4312a4a1fa1a8b674fd9c8050cfc3db (patch) | |
| tree | 13573259926af305d273196047e666b9e4a599f1 /arch | |
| parent | 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0 (diff) | |
| parent | cb922d2596593bac0bf0597eb305cc9bc136cec5 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index e39a417a368d..a92cb499313f 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -33,7 +33,7 @@ config OMAP_DEBUG_DEVICES config OMAP_DEBUG_LEDS bool depends on OMAP_DEBUG_DEVICES - default y if LEDS + default y if LEDS_CLASS config OMAP_RESET_CLOCKS bool "Reset unused clocks during boot" diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index e31496e35b0f..0c8612fd8312 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -156,7 +156,7 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) /* Writing zero to RSYNC_ERR clears the IRQ */ MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1)); } else { - complete(&mcbsp_rx->tx_irq_completion); + complete(&mcbsp_rx->rx_irq_completion); } return IRQ_HANDLED; |