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 /sound/arm | |
| 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 'sound/arm')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index cba71d867542..c2635beb4c88 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -44,7 +44,7 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { | |||
| 44 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { | 44 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { |
| 45 | .name = "AC97 PCM out", | 45 | .name = "AC97 PCM out", |
| 46 | .dev_addr = __PREG(PCDR), | 46 | .dev_addr = __PREG(PCDR), |
| 47 | .drcmr = &DRCMRTXPCDR, | 47 | .drcmr = &DRCMR(12), |
| 48 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | | 48 | .dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG | |
| 49 | DCMD_BURST32 | DCMD_WIDTH4, | 49 | DCMD_BURST32 | DCMD_WIDTH4, |
| 50 | }; | 50 | }; |
| @@ -52,7 +52,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = { | |||
| 52 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = { | 52 | static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = { |
| 53 | .name = "AC97 PCM in", | 53 | .name = "AC97 PCM in", |
| 54 | .dev_addr = __PREG(PCDR), | 54 | .dev_addr = __PREG(PCDR), |
| 55 | .drcmr = &DRCMRRXPCDR, | 55 | .drcmr = &DRCMR(11), |
| 56 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | | 56 | .dcmd = DCMD_INCTRGADDR | DCMD_FLOWSRC | |
| 57 | DCMD_BURST32 | DCMD_WIDTH4, | 57 | DCMD_BURST32 | DCMD_WIDTH4, |
| 58 | }; | 58 | }; |