The patch titled mmc:: msm_sdcc.c: remove references to htc_pwrsink has been added to the -mm tree. Its filename is mmc-msm_sdccc-remove-references-to-htc_pwrsink.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mmc:: msm_sdcc.c: remove references to htc_pwrsink From: Pavel Machek <pavel@xxxxxx> htc_pwrsing code never went to mainline, remove references to it. Signed-off-by: Pavel Machek <pavel@xxxxxx> Cc: <linux-mmc@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN drivers/mmc/host/msm_sdcc.c~mmc-msm_sdccc-remove-references-to-htc_pwrsink drivers/mmc/host/msm_sdcc.c --- a/drivers/mmc/host/msm_sdcc.c~mmc-msm_sdccc-remove-references-to-htc_pwrsink +++ a/drivers/mmc/host/msm_sdcc.c @@ -41,7 +41,6 @@ #include <asm/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, st 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; } _ Patches currently in -mm which might be from pavel@xxxxxx are origin.patch linux-next.patch spitz-backlight-fix-brightness-limiting.patch scripts-get_maintainerpl-add-roles-and-rolestats.patch scripts-get_maintainerpl-fix-non-with-git-blame-and-cleanups.patch mmc-msm_sdccc-remove-references-to-htc_pwrsink.patch lis3lv02d-axis-remap-and-resource-setup-release.patch lis3lv02d-i2c-support.patch fatfs-use-common-time_to_tm-in-fat_time_unix2fat.patch -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html