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.

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index a80ae074b090..a7a3a9c5c6ff 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -49,7 +49,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
         .name                   = "AC97 PCM Stereo out",
         .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRTXPCDR,
+        .drcmr                  = &DRCMR(12),
         .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                   DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -57,7 +57,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
         .name                   = "AC97 PCM Stereo in",
         .dev_addr               = __PREG(PCDR),
-        .drcmr                  = &DRCMRRXPCDR,
+        .drcmr                  = &DRCMR(11),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST32 | DCMD_WIDTH4,
 };
@@ -65,7 +65,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
         .name                   = "AC97 Aux PCM (Slot 5) Mono out",
         .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRTXMODR,
+        .drcmr                  = &DRCMR(10),
         .dcmd                   = DCMD_INCSRCADDR | DCMD_FLOWTRG |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -73,7 +73,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_out = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
         .name                   = "AC97 Aux PCM (Slot 5) Mono in",
         .dev_addr               = __PREG(MODR),
-        .drcmr                  = &DRCMRRXMODR,
+        .drcmr                  = &DRCMR(9),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };
@@ -81,7 +81,7 @@ static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_aux_mono_in = {
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_mic_mono_in = {
         .name                   = "AC97 Mic PCM (Slot 6) Mono in",
         .dev_addr               = __PREG(MCDR),
-        .drcmr                  = &DRCMRRXMCDR,
+        .drcmr                  = &DRCMR(8),
         .dcmd                   = DCMD_INCTRGADDR | DCMD_FLOWSRC |
                                   DCMD_BURST16 | DCMD_WIDTH2,
 };