diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:40:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 16:40:30 -0700 |
| commit | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (patch) | |
| tree | 7691061eecc2884c617f56ab69af1e0592268d61 /drivers/mmc/host/at91_mci.c | |
| parent | 2d3cf588e9bf6df0a22581baece7edeacfbbc9f5 (diff) | |
| parent | e5c0ef90e6cfd40c819bd70748d675067ff862e7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmctip-x86-numa-fixes-2008-05-26_08_53_Mon
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
at91_mci: minor cleanup
mmc: mmc host test driver
mmc: Fix omap compile by replacing dev_name with dma_dev_name
Diffstat (limited to 'drivers/mmc/host/at91_mci.c')
| -rw-r--r-- | drivers/mmc/host/at91_mci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index a28fc2f68ce2..8979ad330a4d 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) gpio_set_value(host->board->vcc_pin, 0); break; case MMC_POWER_UP: - case MMC_POWER_ON: gpio_set_value(host->board->vcc_pin, 1); break; + case MMC_POWER_ON: + break; + default: + WARN_ON(1); } } } |