wireless: replace __FUNCTION__ with __func__

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / pxamci.c

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index d39f59738866c02e8712b9d3eb6cc686de808382..55093ad132ca62037a5dc0b4b1765353a70f0882 100644 (file)
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -31,8 +31,8 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/mmc.h>
+#include <mach/pxa-regs.h>
+#include <mach/mmc.h>
 
 #include "pxamci.h"
 
@@ -177,7 +177,7 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
        if (dalgn)
                DALGN |= (1 << host->dma);
        else
-               DALGN &= (1 << host->dma);
+               DALGN &= ~(1 << host->dma);
        DDADR(host->dma) = host->sg_dma;
        DCSR(host->dma) = DCSR_RUN;
 }