Revert "mmc: unbreak sdhci-esdhc-imx on i.MX25"

This reverts commit 70c3d240cff6a771e530740b56e556942c82907b.
Revert "Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc"

This reverts commit cb080140c27cfaaf8e303aaa43a2448dc92eeeb1, reversing
changes made to 38863c98b2543b3495a34e4aa403388e4767e5d7.