h63xx: mmc and sd card support

[linux-2.6-omap-h63xx.git] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 09aeeba61b75dd24758ffd17d8d062a8dfa19a12..8865175effddbacae7f04b0193672e343b256e6e 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -21,6 +21,8 @@
 #include <asm/scatterlist.h>
 #include <linux/scatterlist.h>
 
+#include <asm/mach-types.h>
+
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/protocol.h>
@@ -963,8 +965,9 @@ static void mmc_read_scrs(struct mmc_host *host)
 
                mmc_decode_scr(card);
        }
-
-       mmc_deselect_cards(host);
+       if (!machine_is_omap_h6300()) {
+               mmc_deselect_cards(host);
+       }
 }
 
 static unsigned int mmc_calculate_clock(struct mmc_host *host)