Merge git://git.infradead.org/iommu-2.6

[mv-sheeva.git] / drivers / mmc / host / msm_sdcc.c

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index dba4600bcdb458e6bd115ef0b1bc30a03a8e6ac7..b31946e0b4ca7ee72224f7e1f880384279d83914 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -38,10 +38,9 @@
 #include <asm/div64.h>
 #include <asm/sizes.h>
 
-#include <asm/mach/mmc.h>
+#include <mach/mmc.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
-#include <mach/htc_pwrsink.h>
 
 #include "msm_sdcc.h"
 
@@ -775,13 +774,11 @@ msmsdcc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
        switch (ios->power_mode) {
        case MMC_POWER_OFF:
-               htc_pwrsink_set(PWRSINK_SDCARD, 0);
                break;
        case MMC_POWER_UP:
                pwr |= MCI_PWR_UP;
                break;
        case MMC_POWER_ON:
-               htc_pwrsink_set(PWRSINK_SDCARD, 100);
                pwr |= MCI_PWR_ON;
                break;
        }