diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-18 15:44:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-18 15:44:29 -0700 |
| commit | e024f69de9bd5b2686019f2491b779044cf89707 (patch) | |
| tree | ba0bd62ea40e54123911b01007895e5afc192033 | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
| parent | 893b66c39da812e7dd0d7b32aa0633e5d90d950c (diff) | |
| download | linux-e024f69de9bd5b2686019f2491b779044cf89707.tar.gz linux-e024f69de9bd5b2686019f2491b779044cf89707.tar.bz2 linux-e024f69de9bd5b2686019f2491b779044cf89707.zip | |
Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm
* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
msm: timer: fix missing return value
msm: Remove extraneous ffa device check
| -rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 7f568611547e..6a96911b0ad5 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -160,10 +160,7 @@ static struct msm_mmc_platform_data qsd8x50_sdc1_data = { static void __init qsd8x50_init_mmc(void) { - if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa()) - vreg_mmc = vreg_get(NULL, "gp6"); - else - vreg_mmc = vreg_get(NULL, "gp5"); + vreg_mmc = vreg_get(NULL, "gp5"); if (IS_ERR(vreg_mmc)) { pr_err("vreg get for vreg_mmc failed (%ld)\n", diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 56f920c55b6a..38b95e949d13 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) /* Use existing clock_event for cpu 0 */ if (!smp_processor_id()) - return; + return 0; writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); |