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: (117 commits)
  [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
  [ARM] 4140/1: AACI stability add ac97 timeout and retries
  [ARM] 4139/1: AACI record support
  [ARM] 4138/1: AACI: multiple channel support for IRQ handling
  [ARM] 4211/1: Provide a defconfig for ns9xxx
  [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
  [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
  [ARM] 4221/1: S3C2443: DMA support
  [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
  [ARM] 4219/1: S3C2443: DMA source definitions
  [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
  [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
  [ARM] 4090/2: avoid clash between PXA and SA1111 defines
  [ARM] 4216/1: add .gitignore entries for ARM specific files
  [ARM] 4214/2: S3C2410: Add Armzone QT2410
  [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
  [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
  [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
  [ARM] 4137/1: Add kexec support
  [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
  ...

Fix up conflict due to typedef removal in sound/arm/aaci.h

1 files changed, 23 insertions, 23 deletions

diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 2ce50f38e3c7..459f4b4feded 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -64,6 +64,7 @@
 #include <linux/err.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/atmel_pdc.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/protocol.h>
@@ -75,7 +76,6 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/at91_mci.h>
-#include <asm/arch/at91_pdc.h>
 
 #define DRIVER_NAME "at91_mci"
 
@@ -211,13 +211,13 @@ static void at91mci_pre_dma_read(struct at91mci_host *host)
 
                 /* Check to see if this needs filling */
                 if (i == 0) {
-                        if (at91_mci_read(host, AT91_PDC_RCR) != 0) {
+                        if (at91_mci_read(host, ATMEL_PDC_RCR) != 0) {
                                 pr_debug("Transfer active in current\n");
                                 continue;
                         }
                 }
                 else {
-                        if (at91_mci_read(host, AT91_PDC_RNCR) != 0) {
+                        if (at91_mci_read(host, ATMEL_PDC_RNCR) != 0) {
                                 pr_debug("Transfer active in next\n");
                                 continue;
                         }
@@ -234,12 +234,12 @@ static void at91mci_pre_dma_read(struct at91mci_host *host)
                 pr_debug("dma address = %08X, length = %d\n", sg->dma_address, sg->length);
 
                 if (i == 0) {
-                        at91_mci_write(host, AT91_PDC_RPR, sg->dma_address);
-                        at91_mci_write(host, AT91_PDC_RCR, sg->length / 4);
+                        at91_mci_write(host, ATMEL_PDC_RPR, sg->dma_address);
+                        at91_mci_write(host, ATMEL_PDC_RCR, sg->length / 4);
                 }
                 else {
-                        at91_mci_write(host, AT91_PDC_RNPR, sg->dma_address);
-                        at91_mci_write(host, AT91_PDC_RNCR, sg->length / 4);
+                        at91_mci_write(host, ATMEL_PDC_RNPR, sg->dma_address);
+                        at91_mci_write(host, ATMEL_PDC_RNCR, sg->length / 4);
                 }
         }
 
@@ -303,7 +303,7 @@ static void at91mci_post_dma_read(struct at91mci_host *host)
                 at91mci_pre_dma_read(host);
         else {
                 at91_mci_write(host, AT91_MCI_IER, AT91_MCI_RXBUFF);
-                at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_RXTDIS | AT91_PDC_TXTDIS);
+                at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
         }
 
         pr_debug("post dma read done\n");
@@ -320,7 +320,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
         pr_debug("Handling the transmit\n");
 
         /* Disable the transfer */
-        at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_RXTDIS | AT91_PDC_TXTDIS);
+        at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
 
         /* Now wait for cmd ready */
         at91_mci_write(host, AT91_MCI_IDR, AT91_MCI_TXBUFE);
@@ -431,15 +431,15 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
                 cmd->opcode, cmdr, cmd->arg, blocks, block_length, at91_mci_read(host, AT91_MCI_MR));
 
         if (!data) {
-                at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_TXTDIS | AT91_PDC_RXTDIS);
-                at91_mci_write(host, AT91_PDC_RPR, 0);
-                at91_mci_write(host, AT91_PDC_RCR, 0);
-                at91_mci_write(host, AT91_PDC_RNPR, 0);
-                at91_mci_write(host, AT91_PDC_RNCR, 0);
-                at91_mci_write(host, AT91_PDC_TPR, 0);
-                at91_mci_write(host, AT91_PDC_TCR, 0);
-                at91_mci_write(host, AT91_PDC_TNPR, 0);
-                at91_mci_write(host, AT91_PDC_TNCR, 0);
+                at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS | ATMEL_PDC_RXTDIS);
+                at91_mci_write(host, ATMEL_PDC_RPR, 0);
+                at91_mci_write(host, ATMEL_PDC_RCR, 0);
+                at91_mci_write(host, ATMEL_PDC_RNPR, 0);
+                at91_mci_write(host, ATMEL_PDC_RNCR, 0);
+                at91_mci_write(host, ATMEL_PDC_TPR, 0);
+                at91_mci_write(host, ATMEL_PDC_TCR, 0);
+                at91_mci_write(host, ATMEL_PDC_TNPR, 0);
+                at91_mci_write(host, ATMEL_PDC_TNCR, 0);
 
                 at91_mci_write(host, AT91_MCI_ARGR, cmd->arg);
                 at91_mci_write(host, AT91_MCI_CMDR, cmdr);
@@ -452,7 +452,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
         /*
          * Disable the PDC controller
          */
-        at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_RXTDIS | AT91_PDC_TXTDIS);
+        at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
 
         if (cmdr & AT91_MCI_TRCMD_START) {
                 data->bytes_xfered = 0;
@@ -481,8 +481,8 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
 
                         pr_debug("Transmitting %d bytes\n", host->total_length);
 
-                        at91_mci_write(host, AT91_PDC_TPR, host->physical_address);
-                        at91_mci_write(host, AT91_PDC_TCR, host->total_length / 4);
+                        at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
+                        at91_mci_write(host, ATMEL_PDC_TCR, host->total_length / 4);
                         ier = AT91_MCI_TXBUFE;
                 }
         }
@@ -497,9 +497,9 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
 
         if (cmdr & AT91_MCI_TRCMD_START) {
                 if (cmdr & AT91_MCI_TRDIR)
-                        at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_RXTEN);
+                        at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN);
                 else
-                        at91_mci_write(host, AT91_PDC_PTCR, AT91_PDC_TXTEN);
+                        at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTEN);
         }
         return ier;
 }