Pull kmalloc into release branch

[powerpc.git] / drivers / mmc / imxmmc.c

diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c
index a4eb1d0..7ca9e95 100644 (file)
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/imxmmc.c
@@ -25,7 +25,6 @@
  *             deficiencies
  *
  */
-#include <linux/config.h>
 
 #ifdef CONFIG_MMC_DEBUG
 #define DEBUG
@@ -228,7 +227,7 @@ static int imxmci_busy_wait_for_status(struct imxmci_host *host,
 static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data)
 {
        unsigned int nob = data->blocks;
-       unsigned int blksz = 1 << data->blksz_bits;
+       unsigned int blksz = data->blksz;
        unsigned int datasz = nob * blksz;
        int i;