Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc

into ppc970.osdl.org:/home/torvalds/v2.6/linux

drivers/mmc/pxamci.c

@@ -547,6 +547,9 @@ static int pxamci_remove(struct device *dev)
 
 		pxa_set_cken(CKEN12_MMC, 0);
 
+		DRCMRRXMMC = 0;
+		DRCMRTXMMC = 0;
+
 		free_irq(host->irq, host);
 		pxa_free_dma(host->dma);
 		iounmap(host->base);