···160160161161static void __init qsd8x50_init_mmc(void)162162{163163- if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa())164164- vreg_mmc = vreg_get(NULL, "gp6");165165- else166166- vreg_mmc = vreg_get(NULL, "gp5");163163+ vreg_mmc = vreg_get(NULL, "gp5");167164168165 if (IS_ERR(vreg_mmc)) {169166 pr_err("vreg get for vreg_mmc failed (%ld)\n",
+1-1
arch/arm/mach-msm/timer.c
···269269270270 /* Use existing clock_event for cpu 0 */271271 if (!smp_processor_id())272272- return;272272+ return 0;273273274274 writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);275275