diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:46:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 20:46:51 -0800 |
| commit | c4e194e3b71ff4fed01d727c32ee1071921d28a3 (patch) | |
| tree | f3d237e46ee08c15693e14c15ed1f93c1946c560 /drivers | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
| parent | 3989d17847071fa94c93299805a9cca27cf65d26 (diff) | |
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
HTC Dream: mmc compilation fixes
video: Allow selecting MSM framebuffer in Kconfig
Add arm msm maintainer entry
msm: Add memory map for HTC Dream
msm: add minimal board file for HTC Dream device
msm: make debugging UART (for DEBUG_LL) configurable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 5 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index dba4600bcdb..b31946e0b4c 100644 --- 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; } diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index bb5fbed89e7..99c0df1c7eb 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2131,7 +2131,7 @@ config FB_PRE_INIT_FB the bootloader. config FB_MSM - tristate + tristate "MSM Framebuffer support" depends on FB && ARCH_MSM select FB_CFB_FILLRECT select FB_CFB_COPYAREA |