diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:03:38 -0400 |
| commit | badc48e6605ddeeb2484afae5993c859494decaa (patch) | |
| tree | 7da638f9bb53b1812b71e40ad6deca91d59ad301 /drivers/mmc/mmci.c | |
| parent | 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a (diff) | |
| parent | 2f880b65fdbc2d4915bddc59d75a176329570fdd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc/mmci.c')
| -rw-r--r-- | drivers/mmc/mmci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index df7e861e2fc7..da8e4d7339cc 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
| @@ -402,9 +402,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 402 | struct mmci_host *host = mmc_priv(mmc); | 402 | struct mmci_host *host = mmc_priv(mmc); |
| 403 | u32 clk = 0, pwr = 0; | 403 | u32 clk = 0, pwr = 0; |
| 404 | 404 | ||
| 405 | DBG(host, "clock %uHz busmode %u powermode %u Vdd %u\n", | ||
| 406 | ios->clock, ios->bus_mode, ios->power_mode, ios->vdd); | ||
| 407 | |||
| 408 | if (ios->clock) { | 405 | if (ios->clock) { |
| 409 | if (ios->clock >= host->mclk) { | 406 | if (ios->clock >= host->mclk) { |
| 410 | clk = MCI_CLK_BYPASS; | 407 | clk = MCI_CLK_BYPASS; |