revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / atmel-mci.c

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 3a569bfe3886f473c900b7e319888d4e3ec47c99..95ef864ad8f9f13e73bbb04c64f966e02a772672 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -26,7 +26,6 @@
 #include <linux/stat.h>
 
 #include <linux/mmc/host.h>
-#include <linux/mmc/sdio.h>
 
 #include <mach/atmel-mci.h>
 #include <linux/atmel-mci.h>
@@ -533,17 +532,12 @@ static u32 atmci_prepare_command(struct mmc_host *mmc,
        data = cmd->data;
        if (data) {
                cmdr |= MCI_CMDR_START_XFER;
-
-               if (cmd->opcode == SD_IO_RW_EXTENDED) {
-                       cmdr |= MCI_CMDR_SDIO_BLOCK;
-               } else {
-                       if (data->flags & MMC_DATA_STREAM)
-                               cmdr |= MCI_CMDR_STREAM;
-                       else if (data->blocks > 1)
-                               cmdr |= MCI_CMDR_MULTI_BLOCK;
-                       else
-                               cmdr |= MCI_CMDR_BLOCK;
-               }
+               if (data->flags & MMC_DATA_STREAM)
+                       cmdr |= MCI_CMDR_STREAM;
+               else if (data->blocks > 1)
+                       cmdr |= MCI_CMDR_MULTI_BLOCK;
+               else
+                       cmdr |= MCI_CMDR_BLOCK;
 
                if (data->flags & MMC_DATA_READ)
                        cmdr |= MCI_CMDR_TRDIR_READ;