Revert "temp revert mmc change"
author黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 18:05:41 +0000 (02:05 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 18:05:41 +0000 (02:05 +0800)
commit2e19d619afa1a21b52afadb7933f38e67bf69dad
treebecfdcfa2acb035b691cfb6b0d83ca8b6c0e5f02
parent972f4c6dd274b77aeba79a65662afde994db8e90
Revert "temp revert mmc change"

This reverts commit 77d6545a14db425b338c866cf4688f277fc17f89.

Conflicts:

drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/card/block.c
drivers/mmc/core/bus.c
drivers/mmc/core/core.c
drivers/mmc/core/host.c
drivers/mmc/core/mmc.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c