GIT 8b1b21853bab15fe5b60b8222786fe036c4dc365 git+ssh://master.kernel.org/home/rmk/linux-2.6-mmc.git

commit 8b1b21853bab15fe5b60b8222786fe036c4dc365
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Tue Jul 11 21:07:10 2006 +0200

    [MMC] Change SDHCI version error to a warning
    
    O2 Micro's controllers have a larger specification version value and are
    therefore denied by the driver. When bypassing this check they seem to work
    fine. This patch makes the code a bit more forgiving by changing the error
    to a warning.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit fb61e2895170920564410baadf71c5b3561dbf42
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Tue Jul 11 21:06:48 2006 +0200

    [MMC] Fix incorrect register access
    
    There was a writel() being used on a 16-bit register.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 8933191..4e21b3b 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -565,7 +565,7 @@ static void sdhci_send_command(struct sd
 	if (cmd->data)
 		flags |= SDHCI_CMD_DATA;
 
-	writel(SDHCI_MAKE_CMD(cmd->opcode, flags),
+	writew(SDHCI_MAKE_CMD(cmd->opcode, flags),
 		host->ioaddr + SDHCI_COMMAND);
 }
 
@@ -1193,10 +1193,8 @@ static int __devinit sdhci_probe_slot(st
 	version = (version & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;
 	if (version != 0) {
 		printk(KERN_ERR "%s: Unknown controller version (%d). "
-			"Cowardly refusing to continue.\n", host->slot_descr,
+			"You may experience problems.\n", host->slot_descr,
 			version);
-		ret = -ENODEV;
-		goto unmap;
 	}
 
 	caps = readl(host->ioaddr + SDHCI_CAPABILITIES);