From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 24 Jul 2008 15:39:28 +0000 (-0700)
Subject: start .26 patches
X-Git-Tag: v2.6.26.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb9af01554a698614fd4bebc4263e76c5e5b70a6;p=thirdparty%2Fkernel%2Fstable-queue.git

start .26 patches
---

diff --git a/queue-2.6.26/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch b/queue-2.6.26/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch
new file mode 100644
index 00000000000..75eda7559a8
--- /dev/null
+++ b/queue-2.6.26/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch
@@ -0,0 +1,29 @@
+From 4fe16897c59882420d66f2d503106653d026ed6c Mon Sep 17 00:00:00 2001
+From: Karl Beldan <karl.beldan@gmail.com>
+Date: Wed, 16 Jul 2008 18:29:11 +0200
+Subject: pxamci: trivial fix of DMA alignment register bit clearing
+
+From: Karl Beldan <karl.beldan@gmail.com>
+
+commit 4fe16897c59882420d66f2d503106653d026ed6c upstream
+
+Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
+Acked-by: Eric Miao <eric.miao@marvell.com>
+Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/mmc/host/pxamci.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/pxamci.c
++++ b/drivers/mmc/host/pxamci.c
+@@ -177,7 +177,7 @@ static void pxamci_setup_data(struct pxa
+ 	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;
+ }
diff --git a/queue-2.6.26/series b/queue-2.6.26/series
new file mode 100644
index 00000000000..c1c8046b17d
--- /dev/null
+++ b/queue-2.6.26/series
@@ -0,0 +1 @@
+pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch