diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 13:09:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 13:09:45 -0400 |
| commit | 7cc4e87f912bbefa440a51856b8d076e5d1f554a (patch) | |
| tree | 1b8df8683f3de37d2e8211ffa8d151f60d59af62 /drivers/media | |
| parent | 5ba2f67afb02c5302b2898949ed6fc3b3d37dcf1 (diff) | |
| parent | 69fc7eed5f56bce15b239e5110de2575a6970df4 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
[ARM] 5300/1: fixup spitz reset during boot
[ARM] 5295/1: make ZONE_DMA optional
[ARM] 5239/1: Palm Zire 72 power management support
[ARM] 5298/1: Drop desc_handle_irq()
[ARM] 5297/1: [KS8695] Fix two compile-time warnings
[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
[ARM] pxa: allow multi-machine PCMCIA builds
[ARM] pxa: add preliminary CPUFREQ support for PXA3xx
[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
[ARM] pxa/zylonite: add support for USB OHCI
[ARM] ohci-pxa27x: use ioremap() and offset for register access
[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
[ARM] pxa: simplify DMA register definitions
[ARM] pxa: make additional DCSR bits valid for PXA3xx
[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
...
Fixed up conflicts in
arch/arm/mach-versatile/core.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
manually.
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/pxa_camera.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 388cf94055d3..cf96b2cc4f1c 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -1025,9 +1025,9 @@ static int pxa_camera_resume(struct soc_camera_device *icd) | |||
| 1025 | struct pxa_camera_dev *pcdev = ici->priv; | 1025 | struct pxa_camera_dev *pcdev = ici->priv; |
| 1026 | int i = 0, ret = 0; | 1026 | int i = 0, ret = 0; |
| 1027 | 1027 | ||
| 1028 | DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD; | 1028 | DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD; |
| 1029 | DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD; | 1029 | DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD; |
| 1030 | DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD; | 1030 | DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD; |
| 1031 | 1031 | ||
| 1032 | CICR0 = pcdev->save_cicr[i++] & ~CICR0_ENB; | 1032 | CICR0 = pcdev->save_cicr[i++] & ~CICR0_ENB; |
| 1033 | CICR1 = pcdev->save_cicr[i++]; | 1033 | CICR1 = pcdev->save_cicr[i++]; |
| @@ -1171,9 +1171,9 @@ static int pxa_camera_probe(struct platform_device *pdev) | |||
| 1171 | } | 1171 | } |
| 1172 | dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]); | 1172 | dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]); |
| 1173 | 1173 | ||
| 1174 | DRCMR68 = pcdev->dma_chans[0] | DRCMR_MAPVLD; | 1174 | DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD; |
| 1175 | DRCMR69 = pcdev->dma_chans[1] | DRCMR_MAPVLD; | 1175 | DRCMR(69) = pcdev->dma_chans[1] | DRCMR_MAPVLD; |
| 1176 | DRCMR70 = pcdev->dma_chans[2] | DRCMR_MAPVLD; | 1176 | DRCMR(70) = pcdev->dma_chans[2] | DRCMR_MAPVLD; |
| 1177 | 1177 | ||
| 1178 | /* request irq */ | 1178 | /* request irq */ |
| 1179 | err = request_irq(pcdev->irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME, | 1179 | err = request_irq(pcdev->irq, pxa_camera_irq, 0, PXA_CAM_DRV_NAME, |