diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-04-04 09:18:00 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-13 10:40:33 +0200 |
| commit | 76d64323e8fb6c7b0a1de64f2fedbcd34b00f274 (patch) | |
| tree | 1e1778d385eb6896190daec4b8d5ffecc820f78b /drivers/mmc | |
| parent | 6aeeb120a56564c1c47b4a24f0d0caa98d704b5f (diff) | |
mmci: Fix after db8500v2 revert merge
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 55abea2c6f9..03495a74861 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -34,6 +34,11 @@ #include <asm/io.h> #include <asm/sizes.h> +#ifdef CONFIG_ARCH_U8500 +/* To be withdrawn when cpu_is_u8500v20_or_later() call will disapear */ +#include <mach/hardware.h> +#endif + #include "mmci.h" #define DRIVER_NAME "mmci-pl18x" @@ -980,7 +985,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq) if (mrq->data && (!variant->non_power_of_2_blksize || #ifdef CONFIG_ARCH_U8500 - !cpu_is_u8500v2() || + !cpu_is_u8500v20_or_later() || #endif (mmc->card && mmc_card_ddr_mode(mmc->card))) && !is_power_of_2(mrq->data->blksz)) { |