Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+2 -5
+1 -4
arch/arm/mach-msm/board-qsd8x50.c
··· 160 160 161 161 static void __init qsd8x50_init_mmc(void) 162 162 { 163 - if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa()) 164 - vreg_mmc = vreg_get(NULL, "gp6"); 165 - else 166 - vreg_mmc = vreg_get(NULL, "gp5"); 163 + vreg_mmc = vreg_get(NULL, "gp5"); 167 164 168 165 if (IS_ERR(vreg_mmc)) { 169 166 pr_err("vreg get for vreg_mmc failed (%ld)\n",
+1 -1
arch/arm/mach-msm/timer.c
··· 269 269 270 270 /* Use existing clock_event for cpu 0 */ 271 271 if (!smp_processor_id()) 272 - return; 272 + return 0; 273 273 274 274 writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); 275 275