From 81605f18623d030557ddfb7859d0bfd7cd9c46b3 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Mon, 24 Sep 2007 15:47:18 -0400
Subject: [PATCH] --- yaml --- r: 65645 b: refs/heads/master c:
 fe2dc44eac1223a0e92859242f58fd2a58a6f8fa h: refs/heads/master i:   65643:
 ffa9650bebf69dc5d534d321a0eea67ff030a0cd v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mmc/host/pxamci.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 88005aa6194b..e1666153e177 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81ab570f65395f09962f4bca0d89403f8911c071
+refs/heads/master: fe2dc44eac1223a0e92859242f58fd2a58a6f8fa
diff --git a/trunk/drivers/mmc/host/pxamci.c b/trunk/drivers/mmc/host/pxamci.c
index 03d162881159..67acc6a00895 100644
--- a/trunk/drivers/mmc/host/pxamci.c
+++ b/trunk/drivers/mmc/host/pxamci.c
@@ -444,9 +444,9 @@ static int pxamci_probe(struct platform_device *pdev)
 	mmc->max_seg_size = PAGE_SIZE;
 
 	/*
-	 * Block length register is 10 bits.
+	 * Block length register is only 10 bits before PXA27x.
 	 */
-	mmc->max_blk_size = 1023;
+	mmc->max_blk_size = (cpu_is_pxa21x() || cpu_is_pxa25x()) ? 1023 : 2048;
 
 	/*
 	 * Block count register is 16 bits.