diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-29 11:23:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-29 11:23:47 -0400 |
| commit | a144a5633c1e625c3134c2ce8d549a054468fd98 (patch) | |
| tree | 3dcb1d6821ee465bb804c786b59c6dabc5c61da1 /drivers | |
| parent | 8fc5ffa063f6551c9e6dd66cab89c46ad41e59c5 (diff) | |
| parent | 3cbc96050b02d8e5764bd0970067ef294737e324 (diff) | |
Merge omap tree
* master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream: (26 commits)
ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
ARM: OMAP: Update dmtimers
ARM: OMAP: Make clock variables static
ARM: OMAP: Fix GPMC compilation when DEBUG is defined
ARM: OMAP: Mux updates for external DMA and GPIO
ARM: OMAP: Add OMAP_TAG_CAMERA_SENSOR
ARM: OMAP: Add initial 24xx suspend support
ARM: OMAP: Update cpufreq support for 24xx
ARM: OMAP: Add GPMC support for OMAP2
ARM: OMAP: Fix DMA channel irq handling for omap24xx
ARM: OMAP: OMAP2 DMA burst support
ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1
ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support
ARM: OMAP: Correct two bugs in arch/arm/mach-omap2/clock.c
ARM: OMAP: Register the 24xx McSPI device
ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen
ARM: OMAP: Aic23 alsa platform driver code for board-innovator
ARM: OMAP: Fix GPIO IRQ mask handling
ARM: OMAP: DMA transfer parameter configuration fix
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/omap.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index c25244b3657b..4aa1e56235c9 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -663,7 +663,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data) | |||
| 663 | return; | 663 | return; |
| 664 | } | 664 | } |
| 665 | /* FIXME: We really should do something to _handle_ the errors */ | 665 | /* FIXME: We really should do something to _handle_ the errors */ |
| 666 | if (ch_status & OMAP_DMA_TOUT_IRQ) { | 666 | if (ch_status & OMAP1_DMA_TOUT_IRQ) { |
| 667 | dev_err(mmc_dev(host->mmc),"DMA timeout\n"); | 667 | dev_err(mmc_dev(host->mmc),"DMA timeout\n"); |
| 668 | return; | 668 | return; |
| 669 | } | 669 | } |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index fbea51448909..36336486c883 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -773,7 +773,7 @@ static void dma_error(int lch, u16 ch_status, void *data) | |||
| 773 | struct omap_ep *ep = data; | 773 | struct omap_ep *ep = data; |
| 774 | 774 | ||
| 775 | /* if ch_status & OMAP_DMA_DROP_IRQ ... */ | 775 | /* if ch_status & OMAP_DMA_DROP_IRQ ... */ |
| 776 | /* if ch_status & OMAP_DMA_TOUT_IRQ ... */ | 776 | /* if ch_status & OMAP1_DMA_TOUT_IRQ ... */ |
| 777 | ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status); | 777 | ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status); |
| 778 | 778 | ||
| 779 | /* complete current transfer ... */ | 779 | /* complete current transfer ... */ |