From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Sep 2005 10:01:08 +0000 (+0300)
Subject: Merge with ../linux-2.6
X-Git-Tag: v2.6.14-rc1-omap1~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=51764ca2d595d62f8bd3ef896a03cb229d30baf3;p=linux-2.6-omap-h63xx.git

Merge with ../linux-2.6
---

51764ca2d595d62f8bd3ef896a03cb229d30baf3
diff --cc drivers/mmc/mmc.c
index 4c68df91b7d,0a8165974ba..dc4d3ad613f
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@@ -474,8 -484,8 +484,9 @@@ static void mmc_power_up(struct mmc_hos
  	int bit = fls(host->ocr_avail) - 1;
  
  	host->ios.vdd = bit;
 +	host->ios.clock = host->f_min;
  	host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+ 	host->ios.chip_select = MMC_CS_DONTCARE;
  	host->ios.power_mode = MMC_POWER_UP;
  	host->ops->set_ios(host, &host->ios);